0
@@ -32,8 +32,11 @@ module Planet
0
         end
0
         bozo = false
0
       rescue Exception => e
0
-        # TODO: never, never, never rescue Exception. This breaks Ctrl-C and a bunch of other things.
0
-        # At least only rescue it if expat is being used since other libs are smart enough never to raise it.
0
+        # Rescuing Exception is a Really Bad Idea, but unfortunately
0
+        # Expat raises it when it shouldn't. So we re-raise exceptions
0
+        # that aren't subclasses of StandardError unless Expat is
0
+        # being used.
0
+        raise e unless @@parser == :expat or e.is_a? StandardError
0
         
0
         # If everything is being bozo'd, enable this to see why.
0
         # print "PARSE ERROR: #{$!}\n  #{$!.backtrace.join("\n  ")}\n"
0
@@ -142,11 +145,11 @@ module Planet
0
         end
0
 
0
         def on_parser_error(message)
0
-          raise Exception.new(message)
0
+          raise message
0
         end
0
 
0
         def on_parser_fatal_error(message)
0
-          raise Exception.new(message)
0
+          raise message
0
         end
0
 
0
         def on_external_subset(name, externalId, systemId)