Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba4ac0cc authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

am 03546553: am b73a0ef4: Merge "use lseek64 to resolve offset oveflow" 

* commit '03546553':
  use lseek64 to resolve offset oveflow
parents 82fe6dae 03546553

toolbox/dd.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -590,8 +590,8 @@ pos_in(void) 




	/* If not a pipe or tape device, try to seek on it. */

	/* If not a pipe or tape device, try to seek on it. */

	if (!(in.flags & (ISPIPE|ISTAPE))) {

	if (!(in.flags & (ISPIPE|ISTAPE))) {

		if (lseek(in.fd,

		if (lseek64(in.fd,

		    (off_t)in.offset * (off_t)in.dbsz, SEEK_CUR) == -1) {

		    (off64_t)in.offset * (off64_t)in.dbsz, SEEK_CUR) == -1) {

			fprintf(stderr, "%s: seek error: %s",

			fprintf(stderr, "%s: seek error: %s",

				in.name, strerror(errno));

				in.name, strerror(errno));

			exit(1);

			exit(1);
@@ -661,8 +661,8 @@ pos_out(void) 
	 * have specified the seek operand.

	 * have specified the seek operand.

	 */

	 */

	if (!(out.flags & ISTAPE)) {

	if (!(out.flags & ISTAPE)) {

		if (lseek(out.fd,

		if (lseek64(out.fd,

		    (off_t)out.offset * (off_t)out.dbsz, SEEK_SET) == -1) {

		    (off64_t)out.offset * (off64_t)out.dbsz, SEEK_SET) == -1) {

			fprintf(stderr, "%s: seek error: %s\n",

			fprintf(stderr, "%s: seek error: %s\n",

				out.name, strerror(errno));

				out.name, strerror(errno));

			exit(1);

			exit(1);