From 657e5980d9054b6b492576984fbe34dab06e17e1 Mon Sep 17 00:00:00 2001
From: clay_shooter <clay_shooter>
Date: Mon, 8 Nov 2010 02:01:16 +0000
Subject: [PATCH] SF2935662 excepInfo not initialized so NULL check says not
 null and manipulates uninitialized data.

---
 docs/ReleaseNotes.html | 5 +++++
 jni/Dispatch.cpp       | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/docs/ReleaseNotes.html b/docs/ReleaseNotes.html
index 5b9ef6e..a8a2313 100644
--- a/docs/ReleaseNotes.html
+++ b/docs/ReleaseNotes.html
@@ -32,6 +32,11 @@
     	checked on every object creation for users who run in the standard
     	<i>all classes in ROT</i> mode. (M2)</td>
   </tr>
+  <tr> 
+    <td width="13%" valign="top">2935662</td>
+    <td width="87%" valign="top">Error handling code crashes because of uninitialized data in Dispatch.cpp
+        Check for NULL fails. pfnDeferredFillIn pointer is not initialized, but it's not NULL.</td>
+  </tr>
   <tr> 
     <td width="13%" valign="top">&nbsp;</td>
     <td width="87%" valign="top">&nbsp;</td>
diff --git a/jni/Dispatch.cpp b/jni/Dispatch.cpp
index 04c6a89..a08153b 100644
--- a/jni/Dispatch.cpp
+++ b/jni/Dispatch.cpp
@@ -418,6 +418,8 @@ JNIEXPORT jobject JNICALL Java_com_jacob_com_Dispatch_invokev
 {
   DISPPARAMS  dispparams;
   EXCEPINFO   excepInfo;
+  // Sourceforge Bug Tracker 2935662 uninitialized data can be not NULL with bad results
+  excepInfo.pfnDeferredFillIn = NULL;
 
   IDispatch *pIDispatch = extractDispatch(env, disp);
   if (!pIDispatch) return NULL;