[ooo-build-commit] Branch 'ooo-build-3-2' - patches/dev300

[Kohei Yoshida]

 patches/dev300/apply                               |    3 +++
 patches/dev300/jvmfwk-uninitialized-value-fix.diff |   12 ++++++++++++
 2 files changed, 15 insertions(+)

New commits:
commit daa88c4d2bc42a603f8f3b8598733a0241cf502b
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Wed Jan 20 09:36:47 2010 -0500

    Empty sigaction.sa_mask properly, using sigemptyset call.
    
    Without doing this, the sa_mask will stay uninitialized, and valgrind
    will complain loudly.
    
    * patches/dev300/apply:
    * patches/dev300/jvmfwk-uninitialized-value-fix.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index e9bb9ff..668f40e 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -3437,6 +3437,9 @@ always-save-option-sfx2.diff,      n#556125, i#5226, kohei
 always-save-option-svtools.diff,   n#556125, i#5226, kohei
 always-save-option-svx.diff,       n#556125, i#5226, kohei
 
+# initialize sigaction struct properly, to keep valgrind happy.
+jvmfwk-uninitialized-value-fix.diff, kohei
+
 [ Speed ]
 # don't throw unnecessary exceptions in sfx2
 speed-sfx2-dont-throw-too-much.diff, i#107512, jholesov
diff --git a/patches/dev300/jvmfwk-uninitialized-value-fix.diff b/patches/dev300/jvmfwk-uninitialized-value-fix.diff
new file mode 100644
index 0000000..45cafb8
--- /dev/null
+++ b/patches/dev300/jvmfwk-uninitialized-value-fix.diff
@@ -0,0 +1,12 @@
+diff --git jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+index a4c7f4f..2e7ea13 100644
+--- jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
++++ jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+@@ -516,6 +516,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
+     // handler
+ #ifdef UNX
+     struct sigaction act;
++    sigemptyset(&act.sa_mask);
+     act.sa_handler=SIG_DFL;
+     act.sa_flags= 0;
+     sigaction( SIGSEGV, &act, NULL);