Date: Fri, 23 Jul 2010 22:24:25 +0000 (UTC) From: Navdeep Parhar <np@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r210438 - head/cddl/contrib/opensolaris/tools/ctf/cvt Message-ID: <201007232224.o6NMOPUd034746@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: np Date: Fri Jul 23 22:24:25 2010 New Revision: 210438 URL: http://svn.freebsd.org/changeset/base/210438 Log: Catch up with r210324. d_buf will be NULL for SHT_NOBITS sections, do not attempt to copy from it in that case. MFC after: 1 month Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c Modified: head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c ============================================================================== --- head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c Fri Jul 23 22:20:26 2010 (r210437) +++ head/cddl/contrib/opensolaris/tools/ctf/cvt/output.c Fri Jul 23 22:24:25 2010 (r210438) @@ -644,7 +644,7 @@ write_file(Elf *src, const char *srcname } #if !defined(sun) - if (ddata->d_buf == NULL) { + if (ddata->d_buf == NULL && sdata->d_buf != NULL) { ddata->d_buf = xmalloc(shdr.sh_size); bcopy(sdata->d_buf, ddata->d_buf, shdr.sh_size); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007232224.o6NMOPUd034746>