[webkit-changes] cvs commit: JavaScriptCore/bindings/jni jni_instance.cpp jni_runtime.cpp

Geoffrey ggaren at opensource.apple.com
Mon Aug 8 14:14:54 PDT 2005


ggaren      05/08/08 14:14:54

  Modified:    .        ChangeLog
               bindings/jni jni_instance.cpp jni_runtime.cpp
  Log:
  Bug #:
  
  Revision  Changes    Path
  1.782     +14 -0     JavaScriptCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/ChangeLog,v
  retrieving revision 1.781
  retrieving revision 1.782
  diff -u -r1.781 -r1.782
  --- ChangeLog	8 Aug 2005 16:39:56 -0000	1.781
  +++ ChangeLog	8 Aug 2005 21:14:53 -0000	1.782
  @@ -1,3 +1,17 @@
  +2005-08-08  Geoffrey Garen  <ggaren at apple.com>
  +
  +        -fixed crash caused by fix for http://bugzilla.opendarwin.org/show_bug.cgi?id=4313
  +        
  +        - exceptionDescription now gets explicitly initialized to NULL in all
  +        the places listed below -- our wrapper classes used to take care of this 
  +        automagically
  +        
  +        * bindings/jni/jni_instance.cpp:
  +        (JavaInstance::invokeMethod):
  +        * bindings/jni/jni_runtime.cpp:
  +        (JavaField::dispatchValueFromInstance):
  +        (JavaField::dispatchSetValueToInstance):
  +
   2005-08-08  Darin Adler  <darin at apple.com>
   
           Reviewed by John Sullivan.
  
  
  
  1.27      +1 -1      JavaScriptCore/bindings/jni/jni_instance.cpp
  
  Index: jni_instance.cpp
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/bindings/jni/jni_instance.cpp,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- jni_instance.cpp	8 Aug 2005 04:07:24 -0000	1.26
  +++ jni_instance.cpp	8 Aug 2005 21:14:54 -0000	1.27
  @@ -155,7 +155,7 @@
       bool handled = false;
       if (execContext && execContext->nativeHandle()) {
           jobject obj = _instance->_instance;
  -        ValueImp *exceptionDescription;
  +        ValueImp *exceptionDescription = NULL;
           const char *callingURL = 0;  // FIXME, need to propagate calling URL to Java
           handled = dispatchJNICall (execContext->nativeHandle(), obj, jMethod->isStatic(), jMethod->JNIReturnType(), jMethod->methodID(obj), jArgs, result, callingURL, exceptionDescription);
           if (exceptionDescription) {
  
  
  
  1.27      +2 -2      JavaScriptCore/bindings/jni/jni_runtime.cpp
  
  Index: jni_runtime.cpp
  ===================================================================
  RCS file: /cvs/root/JavaScriptCore/bindings/jni/jni_runtime.cpp,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- jni_runtime.cpp	8 Aug 2005 04:07:24 -0000	1.26
  +++ jni_runtime.cpp	8 Aug 2005 21:14:54 -0000	1.27
  @@ -90,7 +90,7 @@
   	{
   	    const RootObject *execContext = instance->executionContext();
   	    if (execContext && execContext->nativeHandle()) {
  -		ValueImp *exceptionDescription;
  +		ValueImp *exceptionDescription = NULL;
   		jvalue args[1];
   		
   		args[0].l = jinstance;
  @@ -176,7 +176,7 @@
   	{
   	    const RootObject *execContext = instance->executionContext();
   	    if (execContext && execContext->nativeHandle()) {
  -		ValueImp *exceptionDescription;
  +		ValueImp *exceptionDescription = NULL;
   		jvalue args[2];
   		jvalue result;
   		
  
  
  



More information about the webkit-changes mailing list