Date: Fri, 14 May 2010 19:24:21 GMT From: Jonathan Anderson <jona@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 178262 for review Message-ID: <201005141924.o4EJOLwJ050890@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@178262?ac=10 Change 178262 by jona@jona-belle-freebsd8 on 2010/05/14 19:24:03 Only set *relative_name if relative_name != NULL Affected files ... .. //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#14 edit .. //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.h#8 edit Differences ... ==== //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#14 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#13 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_fdlist.c#14 $ */ #include <sys/mman.h> @@ -402,7 +402,8 @@ /* try to find the file itself in the FD list */ size_t len = strlen(filename); - *relative_name = filename + len; + if (relative_name) + *relative_name = filename + len; while (fd == -1) { ==== //depot/projects/trustedbsd/capabilities/src/libexec/rtld-elf/rtld.h#8 (text+ko) ==== @@ -226,6 +226,7 @@ struct link_map linkmap; /* For GDB and dlinfo() */ Objlist dldags; /* Object belongs to these dlopened DAGs (%) */ Objlist dagmembers; /* DAG has these members (%) */ + int fd; /* Object's file descriptor */ dev_t dev; /* Object's filesystem's device */ ino_t ino; /* Object's inode number */ void *priv; /* Platform-dependant */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005141924.o4EJOLwJ050890>