From: Eduardo Santiago <santiago@redhat.com>
Date: Fri, 28 May 2010 21:26:52 +0000 (-0700)
Subject: Fix dwarf_getlocation crash on NULL argument.
X-Git-Tag: elfutils-0.148~43^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2240bc4dc850e49062094d78c21c50038f31ccf;p=thirdparty%2Felfutils.git

Fix dwarf_getlocation crash on NULL argument.
---

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index 9f876523c..41203397e 100644
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-28  Eduardo Santiago  <santiago@redhat.com>
+
+	* dwarf_getlocation.c (dwarf_getlocation): Do attr_ok check first thing.
+
 2010-05-27  Roland McGrath  <roland@redhat.com>
 
 	* dwarf.h: Add DW_AT_enum_class, DW_AT_linkage_name,
diff --git a/libdw/dwarf_getlocation.c b/libdw/dwarf_getlocation.c
index ede8c3c9d..c89488b30 100644
--- a/libdw/dwarf_getlocation.c
+++ b/libdw/dwarf_getlocation.c
@@ -541,13 +541,13 @@ dwarf_getlocation (attr, llbuf, listlen)
      Dwarf_Op **llbuf;
      size_t *listlen;
 {
+  if (! attr_ok (attr))
+    return -1;
+
   int result = check_constant_offset (attr, llbuf, listlen);
   if (result != 1)
     return result;
 
-  if (! attr_ok (attr))
-    return -1;
-
   /* If it has a block form, it's a single location expression.  */
   Dwarf_Block block;
   if (INTUSE(dwarf_formblock) (attr, &block) != 0)