Date: Wed, 14 Jan 2015 21:23:46 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r277194 - stable/10/lib/libstand Message-ID: <201501142123.t0ELNkN4020965@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Wed Jan 14 21:23:46 2015 New Revision: 277194 URL: https://svnweb.freebsd.org/changeset/base/277194 Log: MFC r276412: Fix loader's ability to read the 10.1 release PowerPC ISOs. There appears to be some kind of problem with the version of makefs used for these disks. There may be a better way to handle this problem, so I've set the MFC timer for a fairly long time period. Modified: stable/10/lib/libstand/cd9660.c Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/libstand/cd9660.c ============================================================================== --- stable/10/lib/libstand/cd9660.c Wed Jan 14 19:49:07 2015 (r277193) +++ stable/10/lib/libstand/cd9660.c Wed Jan 14 21:23:46 2015 (r277194) @@ -151,9 +151,14 @@ susp_lookup_record(struct open_file *f, return (NULL); p = susp_buffer + isonum_733(shc->offset); end = p + isonum_733(shc->length); - } else + } else { /* Ignore this record and skip to the next. */ p += isonum_711(sh->length); + + /* Avoid infinite loops with corrupted file systems */ + if (isonum_711(sh->length) == 0) + return (NULL); + } } return (NULL); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501142123.t0ELNkN4020965>