svn commit: r266512 - head/usr.bin/mkimg

Marcel Moolenaar marcel at FreeBSD.org
Wed May 21 17:38:14 UTC 2014


Author: marcel
Date: Wed May 21 17:38:14 2014
New Revision: 266512
URL: http://svnweb.freebsd.org/changeset/base/266512

Log:
  Fix CID 1215124: Handle errors properly.

Modified:
  head/usr.bin/mkimg/image.c

Modified: head/usr.bin/mkimg/image.c
==============================================================================
--- head/usr.bin/mkimg/image.c	Wed May 21 17:37:22 2014	(r266511)
+++ head/usr.bin/mkimg/image.c	Wed May 21 17:38:14 2014	(r266512)
@@ -119,8 +119,12 @@ image_copyout(int fd)
 		}
 	}
 	free(buffer);
+	if (error)
+		return (error);
 	ofs = lseek(fd, 0L, SEEK_CUR);
-	ftruncate(fd, ofs);
+	if (ofs == -1)
+		return (errno);
+	error = (ftruncate(fd, ofs) == -1) ? errno : 0;
 	return (error);
 }
 


More information about the svn-src-head mailing list