]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Thu, 21 Apr 2011 16:10:06 +0000 (16:10 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Thu, 21 Apr 2011 16:10:06 +0000 (16:10 +0000)
magick/magick.c

index 592f8e4273c501504b03adc5972fcc1896beb105..d0a7fac191ef55ed8652d9b8f281e87baacfdea7 100644 (file)
@@ -1186,6 +1186,10 @@ static void MagickSignalHandler(int signal_number)
   if (signal_number == SIGXFSZ)
     abort();
 #endif
+#if defined(SIGBUS)
+  if (signal_number == SIGBUS)
+    abort();
+#endif
 #if !defined(MAGICKCORE_HAVE__EXIT)
   exit(signal_number);
 #else
@@ -1200,10 +1204,6 @@ static void MagickSignalHandler(int signal_number)
 #if defined(SIGTERM)
   if (signal_number == SIGTERM)
     exit(signal_number);
-#endif
-#if defined(SIGBUS)
-  if (signal_number == SIGBUS)
-    exit(signal_number);
 #endif
   _exit(signal_number);  /* do not invoke registered atexit() methods */
 #endif
@@ -1289,6 +1289,10 @@ MagickExport void MagickCoreGenesis(const char *path,
       if (signal_handlers[SIGABRT] == (SignalHandler *) NULL)
         signal_handlers[SIGABRT]=RegisterMagickSignalHandler(SIGABRT);
 #endif
+#if defined(SIGBUS)
+      if (signal_handlers[SIGBUS] == (SignalHandler *) NULL)
+        signal_handlers[SIGBUS]=RegisterMagickSignalHandler(SIGBUS);
+#endif
 #if defined(SIGFPE)
       if (signal_handlers[SIGFPE] == (SignalHandler *) NULL)
         signal_handlers[SIGFPE]=RegisterMagickSignalHandler(SIGFPE);
@@ -1309,10 +1313,6 @@ MagickExport void MagickCoreGenesis(const char *path,
       if (signal_handlers[SIGTERM] == (SignalHandler *) NULL)
         signal_handlers[SIGTERM]=RegisterMagickSignalHandler(SIGTERM);
 #endif
-#if defined(SIGBUS)
-      if (signal_handlers[SIGBUS] == (SignalHandler *) NULL)
-        signal_handlers[SIGBUS]=RegisterMagickSignalHandler(SIGBUS);
-#endif
 #if defined(SIGXCPU)
       if (signal_handlers[SIGXCPU] == (SignalHandler *) NULL)
         signal_handlers[SIGXCPU]=RegisterMagickSignalHandler(SIGXCPU);