Date: Thu, 19 Mar 2009 14:20:01 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r190057 - in stable/7/sys: . fs/udf Message-ID: <200903191420.n2JEK1DP064742@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Thu Mar 19 14:20:00 2009 New Revision: 190057 URL: http://svn.freebsd.org/changeset/base/190057 Log: MFC 189111: udf_readatoffset: correctly hanlde data in fentry Approved by: jhb (mentor) Modified: stable/7/sys/ (props changed) stable/7/sys/fs/udf/udf_vnops.c Modified: stable/7/sys/fs/udf/udf_vnops.c ============================================================================== --- stable/7/sys/fs/udf/udf_vnops.c Thu Mar 19 14:17:34 2009 (r190056) +++ stable/7/sys/fs/udf/udf_vnops.c Thu Mar 19 14:20:00 2009 (r190057) @@ -1305,6 +1305,12 @@ udf_readatoffset(struct udf_node *node, fentry = node->fentry; *data = &fentry->data[le32toh(fentry->l_ea)]; *size = le32toh(fentry->l_ad); + if (offset >= *size) + *size = 0; + else { + *data += offset; + *size -= offset; + } return (0); } else if (error != 0) { return (error);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903191420.n2JEK1DP064742>