2 files changed, 6 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index de6dbc2..a02b93a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-17  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	* auxv.c (fprint_target_auxv): Stop at AT_NULL.
+
 2008-07-15  Andreas Schwab  <schwab@suse.de>
 
 	* valops.c (value_cast_pointers): Follow typedefs when checking
diff --git a/gdb/auxv.c b/gdb/auxv.c
index 292a0d6..549b666 100644
--- a/gdb/auxv.c
+++ b/gdb/auxv.c
@@ -246,6 +246,8 @@ fprint_target_auxv (struct ui_file *file, struct target_ops *ops)
 	  break;
 	}
       ++ents;
+      if (type == AT_NULL)
+	break;
     }
 
   xfree (data);