changeset 13438:084a34091b25

1301 ld crashes with '-z ignore' due to a null data descriptor Reviewed by: Gordon Ross <gwr@nexenta.com> Reviewed by: Dan McDonald <danmcd@nexenta.com> Reviewed by: Igor Kozhukhov <ikozhukhov@gmail.com> Reviewed by: Albert Lee <trisk@nexenta.com> Approved by: Eric Schrock <eric.schrock@delphix.com>
author Richard Lowe <richlowe@richlowe.net>
date Fri, 29 Jul 2011 04:21:44 +0100
parents 170f0c3a9064
children da58f9d4ef03
files usr/src/cmd/sgs/libld/common/outfile.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/sgs/libld/common/outfile.c	Thu Aug 18 12:28:47 2011 -0700
+++ b/usr/src/cmd/sgs/libld/common/outfile.c	Fri Jul 29 04:21:44 2011 +0100
@@ -712,9 +712,9 @@
 					break;
 
 				d = elf_getdata(osp->os_scn, NULL);
-				assert(d != NULL);
 
-				d->d_align = pad_align;
+				if (d != NULL)
+					d->d_align = pad_align;
 			}
 		}
 	}