[Gnash-commit] gnash ChangeLog plugin/klash/klash_part.cpp

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     06/08/19 18:51:20

Modified files:
        .              : ChangeLog 
        plugin/klash   : klash_part.cpp 

Log message:
        Make extra sure we don't kill all processes.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.656&r2=1.657
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash_part.cpp?cvsroot=gnash&r1=1.5&r2=1.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.656
retrieving revision 1.657
diff -u -b -r1.656 -r1.657
--- ChangeLog   19 Aug 2006 15:01:54 -0000      1.656
+++ ChangeLog   19 Aug 2006 18:51:20 -0000      1.657
@@ -1,3 +1,8 @@
+2006-08-19 Bastiaan Jacques <address@hidden>
+
+       * plugin/klash/klash_part.cpp: Make extra sure we don't kill all
+       processes.
+
 2006-08-19 Sandro Santilli  <address@hidden>
 
        * server/sprite_instance.h, server/sprite_instance.cpp

Index: plugin/klash/klash_part.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash_part.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- plugin/klash/klash_part.cpp 25 Apr 2006 14:43:38 -0000      1.5
+++ plugin/klash/klash_part.cpp 19 Aug 2006 18:51:20 -0000      1.6
@@ -202,8 +202,17 @@
         if (m_process->isRunning ()) {
             ; // IPC close
             //m_process->wait(2);
+           
+           // Ignore SIGTERM, so we won't kill ourselves.
             void (*oldhandler)(int) = signal(SIGTERM, SIG_IGN);
-            ::kill (-1 * ::getpid (), SIGTERM);
+
+           int pid = -1 * ::getpid();
+           assert(pid < -1);
+
+           // Terminate every process in our process group.
+            ::kill (pid, SIGTERM);
+
+           // Restore the old handler.
             signal(SIGTERM, oldhandler);
             m_process->wait(2);
         }