diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c933612eba..9f146985c8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-04  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* dwarf2read.c (dwarf2_ranges_read, read_partial_die): Initialize
+	locals.
+
 2008-05-04  Pedro Alves  <pedro@codesourcery.com>
 
 	* breakpoint.c (update_breakpoints_after_exec): Delete bp_longjmp
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 67c4ef88f1..193a38758b 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -3226,8 +3226,7 @@ dwarf2_ranges_read (unsigned offset, CORE_ADDR *low_return,
 
   low_set = 0;
 
-  if (ranges_pst != NULL)
-    baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
+  baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
 
   while (1)
     {
@@ -5858,7 +5857,7 @@ read_partial_die (struct partial_die_info *part_die,
   struct attribute attr;
   int has_low_pc_attr = 0;
   int has_high_pc_attr = 0;
-  CORE_ADDR base_address;
+  CORE_ADDR base_address = 0;
   enum
     {
       base_address_none,