Fix for the same

* Initialize data.s for data	that do not need a conversion.

2 files changed, 11 insertions, 3 deletions

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index b0cff67c..1fbdf4cc 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-01  Petr Machata  <[email protected]>
+
+	* elf_getdata.c (__elf_getdata_rdlock): Initialize data.s for data
+	that do not need a conversion.
+
 2010-03-11  Roland McGrath  <[email protected]>
 
 	* elf.h: Update from glibc.
diff --git a/libelf/elf_getdata.c b/libelf/elf_getdata.c
index e083b033..5a718f82 100644
--- a/libelf/elf_getdata.c
+++ b/libelf/elf_getdata.c
@@ -467,9 +467,12 @@ __elf_getdata_rdlock (scn, data)
 			scn->rawdata.d.d_size, scn->rawdata.d.d_type);
 	}
       else
-	/* This is an empty or NOBITS section.  There is no buffer but
-	   the size information etc is important.  */
-	scn->data_list.data.d = scn->rawdata.d;
+	{
+	  /* This is an empty or NOBITS section.  There is no buffer but
+	     the size information etc is important.  */
+	  scn->data_list.data.d = scn->rawdata.d;
+	  scn->data_list.data.s = scn;
+	}
 
       scn->data_list_rear = &scn->data_list;
     }