Date: Wed, 21 May 2014 17:38:14 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r266512 - head/usr.bin/mkimg Message-ID: <201405211738.s4LHcEmj021285@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405211738.s4LHcEmj021285>