Index: gdb/cp-abi.c
===================================================================
RCS file: /cvs/src/src/gdb/cp-abi.c,v
retrieving revision 1.21
diff -u -p -u -r1.21 cp-abi.c
--- gdb/cp-abi.c	1 Jan 2008 22:53:09 -0000	1.21
+++ gdb/cp-abi.c	14 Jul 2008 18:01:19 -0000
@@ -22,6 +22,7 @@
 #include "value.h"
 #include "cp-abi.h"
 #include "command.h"
+#include "exceptions.h"
 #include "gdbcmd.h"
 #include "ui-out.h"
 
@@ -89,9 +90,17 @@ value_virtual_fn_field (struct value **a
 struct type *
 value_rtti_type (struct value *v, int *full, int *top, int *using_enc)
 {
+  struct type *ret = NULL;
+  struct gdb_exception e;
   if ((current_cp_abi.rtti_type) == NULL)
     return NULL;
-  return (*current_cp_abi.rtti_type) (v, full, top, using_enc);
+  TRY_CATCH (e, RETURN_MASK_ERROR)
+    {
+      ret = (*current_cp_abi.rtti_type) (v, full, top, using_enc);
+    }
+  if (e.reason < 0)
+    return NULL;
+  return ret;
 }
 
 void
Index: gdb/testsuite/gdb.cp/class2.cc
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/class2.cc,v
retrieving revision 1.6
diff -u -p -u -r1.6 class2.cc
--- gdb/testsuite/gdb.cp/class2.cc	1 Jan 2008 22:53:19 -0000	1.6
+++ gdb/testsuite/gdb.cp/class2.cc	14 Jul 2008 18:01:19 -0000
@@ -41,6 +41,12 @@ B::~B()
   b2 = 902;
 }
 
+struct C : public B
+{
+  A *c1;
+  A *c2;
+};
+
 // Stop the compiler from optimizing away data.
 void refer (A *)
 {
@@ -57,16 +63,19 @@ void refer (empty *)
 
 int main (void)
 {
-  A alpha, *aap, *abp;
+  A alpha, *aap, *abp, *acp;
   B beta, *bbp;
+  C gamma;
   empty e;
 
   alpha.a1 = 100;
   beta.a1 = 200; beta.b1 = 201; beta.b2 = 202;
+  gamma.c1 = 0; gamma.c2 = (A *) ~0UL;
 
   aap = &alpha; refer (aap);
   abp = &beta;  refer (abp);
   bbp = &beta;  refer (bbp);
+  acp = &gamma; refer (acp);
   refer (&e);
 
   return 0;  // marker return 0
Index: gdb/testsuite/gdb.cp/class2.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/class2.exp,v
retrieving revision 1.6
diff -u -p -u -r1.6 class2.exp
--- gdb/testsuite/gdb.cp/class2.exp	1 Jan 2008 22:53:19 -0000	1.6
+++ gdb/testsuite/gdb.cp/class2.exp	14 Jul 2008 18:01:19 -0000
@@ -117,3 +117,10 @@ gdb_test "print * (B *) abp" \
 # Printing the value of an object containing no data fields:
 
 gdb_test "p e" "= \{<No data fields>\}" "print object with no data fields"
+
+# Printing NULL pointers with "set print object on"
+
+gdb_test "set print object on" ""
+gdb_test "p acp" "= \\(C \\*\\) 0x\[a-f0-9\]+"
+gdb_test "p acp->c1" "\\(A \\*\\) 0x0"
+gdb_test "p acp->c2" "\\(A \\*\\) 0xf+"