Changeset 79998 in webkit


Ignore:
Timestamp:
Mar 1, 2011 6:31:22 AM (13 years ago)
Author:
steveblock@google.com
Message:

2011-03-01 Steve Block <​steveblock@google.com>

Reviewed by Pavel Feldman.

JNI code in Java bridge is not correctly guarded
​https://bugs.webkit.org/show_bug.cgi?id=55459

No new tests, build fix only.

  • bridge/jni/v8/JNIBridgeV8.cpp:
  • bridge/jni/v8/JNIBridgeV8.h:
  • bridge/jni/v8/JNIUtilityPrivate.cpp:
  • bridge/jni/v8/JNIUtilityPrivate.h:
  • bridge/jni/v8/JavaClassV8.cpp:
  • bridge/jni/v8/JavaClassV8.h:
  • bridge/jni/v8/JavaInstanceV8.cpp:
  • bridge/jni/v8/JavaInstanceV8.h:
  • bridge/jni/v8/JavaNPObjectV8.cpp:
  • bridge/jni/v8/JavaNPObjectV8.h:
Location:
trunk/Source/WebCore
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r79988 r79998  
     12011-03-01  Steve Block  <steveblock@google.com>
     2
     3        Reviewed by Pavel Feldman.
     4
     5        JNI code in Java bridge is not correctly guarded
     6        https://bugs.webkit.org/show_bug.cgi?id=55459
     7
     8        No new tests, build fix only.
     9
     10        * bridge/jni/v8/JNIBridgeV8.cpp:
     11        * bridge/jni/v8/JNIBridgeV8.h:
     12        * bridge/jni/v8/JNIUtilityPrivate.cpp:
     13        * bridge/jni/v8/JNIUtilityPrivate.h:
     14        * bridge/jni/v8/JavaClassV8.cpp:
     15        * bridge/jni/v8/JavaClassV8.h:
     16        * bridge/jni/v8/JavaInstanceV8.cpp:
     17        * bridge/jni/v8/JavaInstanceV8.h:
     18        * bridge/jni/v8/JavaNPObjectV8.cpp:
     19        * bridge/jni/v8/JavaNPObjectV8.h:
     20
    1212011-03-01  Steve Block  <steveblock@google.com>
    222

  • trunk/Source/WebCore/bridge/jni/v8/JNIBridgeV8.cpp

    r65833 r79998  
    2727#include "JNIBridgeV8.h"
    2828
     29#if ENABLE(JAVA_BRIDGE)
     30
    2931using namespace JSC::Bindings;
    3032
    … …  
    4345    m_field = new JObjectWrapper(aField);
    4446}
     47
     48#endif // ENABLE(JAVA_BRIDGE)

  • trunk/Source/WebCore/bridge/jni/v8/JNIBridgeV8.h

    r65833 r79998  
    2727#define JNIBridgeV8_h
    2828
     29#if ENABLE(JAVA_BRIDGE)
     30
    2931#include "JNIBridge.h" // For JavaString
    3032#include "JavaInstanceV8.h" // For JObjectWrapper
    … …  
    5456} // namespace JSC
    5557
     58#endif // ENABLE(JAVA_BRIDGE)
     59
    5660#endif // JNIBridgeV8_h

  • trunk/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.cpp

    r74288 r79998  
    2727#include "JNIUtilityPrivate.h"
    2828
     29#if ENABLE(JAVA_BRIDGE)
     30
    2931#include "JavaInstanceV8.h"
    3032#include "JavaNPObjectV8.h"
    … …  
    257259}
    258260
    259 } // end of namespace Bindings
    260 
    261 } // end of namespace JSC
     261} // namespace Bindings
     262
     263} // namespace JSC
     264
     265#endif // ENABLE(JAVA_BRIDGE)

  • trunk/Source/WebCore/bridge/jni/v8/JNIUtilityPrivate.h

    r54171 r79998  
    2727#define JNIUtilityPrivate_h
    2828
     29#if ENABLE(JAVA_BRIDGE)
     30
    2931#include "JNIUtility.h"
    3032#include "npruntime.h"
    … …  
    4143} // namespace JSC
    4244
     45#endif // ENABLE(JAVA_BRIDGE)
     46
    4347#endif // JNIUtilityPrivate_h

  • trunk/Source/WebCore/bridge/jni/v8/JavaClassV8.cpp

    r72740 r79998  
    2626#include "config.h"
    2727#include "JavaClassV8.h"
     28
     29#if ENABLE(JAVA_BRIDGE)
    2830
    2931using namespace JSC::Bindings;
    … …  
    102104    return m_fields.get(name);
    103105}
     106
     107#endif // ENABLE(JAVA_BRIDGE)

  • trunk/Source/WebCore/bridge/jni/v8/JavaClassV8.h

    r72740 r79998  
    2626#ifndef JavaClassV8_h
    2727#define JavaClassV8_h
     28
     29#if ENABLE(JAVA_BRIDGE)
    2830
    2931#include "JNIBridgeV8.h"
    … …  
    5860} // namespace JSC
    5961
     62#endif // ENABLE(JAVA_BRIDGE)
     63
    6064#endif // JavaClassV8_h

  • trunk/Source/WebCore/bridge/jni/v8/JavaInstanceV8.cpp

    r62650 r79998  
    2727#include "config.h"
    2828#include "JavaInstanceV8.h"
     29
     30#if ENABLE(JAVA_BRIDGE)
    2931
    3032#include "JNIBridge.h"
    … …  
    172174    m_env->DeleteGlobalRef(m_instance);
    173175}
     176
     177#endif // ENABLE(JAVA_BRIDGE)

  • trunk/Source/WebCore/bridge/jni/v8/JavaInstanceV8.h

    r79947 r79998  
    2727#ifndef JavaInstanceV8_h
    2828#define JavaInstanceV8_h
     29
     30#if ENABLE(JAVA_BRIDGE)
    2931
    3032#include "JNIUtility.h"
    … …  
    98100} // namespace JSC
    99101
     102#endif // ENABLE(JAVA_BRIDGE)
     103
    100104#endif // JavaInstanceV8_h

  • trunk/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.cpp

    r65833 r79998  
    2727#include "config.h"
    2828#include "JavaNPObjectV8.h"
     29
     30#if ENABLE(JAVA_BRIDGE)
    2931
    3032#include "JNIUtilityPrivate.h"
    … …  
    167169
    168170} // namespace JSC
     171
     172#endif // ENABLE(JAVA_BRIDGE)

  • trunk/Source/WebCore/bridge/jni/v8/JavaNPObjectV8.h

    r54237 r79998  
    2727#define JavaNPObjectV8_h
    2828
     29#if ENABLE(JAVA_BRIDGE)
     30
    2931#include "npruntime.h"
    3032#include <wtf/RefPtr.h>
    … …  
    5456} // namespace JSC
    5557
     58#endif // ENABLE(JAVA_BRIDGE)
     59
    5660#endif // JavaNPObjectV8_h
Note: See TracChangeset for help on using the changeset viewer.