Fix conversions from 32-bit pointers to signed 64-bit integers.

base/android/linker/linker_jni.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This is the Android-specific Chromium linker, a tiny shared library
 // implementing a custom dynamic linker that can be used to load the
 // real Chromium libraries (e.g. libcontentshell.so).
 
 // The main point of this linker is to be able to share the RELRO
 // section of libcontentshell.so (or equivalent) between the browser and
 // renderer process.
 
 // This source code *cannot* depend on anything from base/ or the C++
 // STL, to keep the final library small, and avoid ugly dependency issues.
 
 #include <android/log.h>
 #include <crazy_linker.h>
 #include <jni.h>
 #include <stdlib.h>
 #include <sys/mman.h>
 #include <unistd.h>
 
 // Set this to 1 to enable debug traces to the Android log.
 // Note that LOG() from "base/logging.h" cannot be used, since it is
 // in base/ which hasn't been loaded yet.
-#define DEBUG 0
+#define DEBUG 1

[Yaron, 2014/09/03 14:24:56]

revert

[whywhat, 2014/09/03 14:40:28]

Done.

 
 #define TAG "chromium_android_linker"
 
 #if DEBUG
 #define LOG_INFO(...) __android_log_print(ANDROID_LOG_INFO, TAG, __VA_ARGS__)
 #else
 #define LOG_INFO(...) ((void)0)
 #endif
 #define LOG_ERROR(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)
 
@@ skipping 408 matching lines @@
     return false;
   }
 
   // Copy the callback; the one passed as an argument may be temporary.
   crazy_callback_t* callback = new crazy_callback_t();
   *callback = *callback_request;
 
   LOG_INFO("%s: Calling back to java with handler %p, opaque %p",
            __FUNCTION__, callback->handler, callback->opaque);
 
-  jlong arg = static_cast<jlong>(reinterpret_cast<intptr_t>(callback));
+  jlong arg = static_cast<jlong>(reinterpret_cast<uintptr_t>(callback));
+
   env->CallStaticVoidMethod(
       s_java_callback_bindings.clazz, s_java_callback_bindings.method_id, arg);
 
   // Back out and return false if we encounter a JNI exception.
   if (env->ExceptionCheck() == JNI_TRUE) {
     env->ExceptionDescribe();
     env->ExceptionClear();
     delete callback;
     return false;
   }
@@ skipping 97 matching lines @@
 
 jlong GetRandomBaseLoadAddress(JNIEnv* env, jclass clazz, jlong bytes) {
   void* address =
       mmap(NULL, bytes, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
   if (address == MAP_FAILED) {
     LOG_INFO("%s: Random base load address not determinable\n", __FUNCTION__);
     return 0;
   }
   munmap(address, bytes);
   LOG_INFO("%s: Random base load address is %p\n", __FUNCTION__, address);
-  return static_cast<jlong>(reinterpret_cast<intptr_t>(address));
+  return static_cast<jlong>(reinterpret_cast<uintptr_t>(address));
 }
 
 const JNINativeMethod kNativeMethods[] = {
     {"nativeLoadLibrary",
      "("
      "Ljava/lang/String;"
      "J"
      "Lorg/chromium/base/library_loader/Linker$LibInfo;"
      ")"
      "Z",
@@ skipping 82 matching lines @@
   crazy_context_t* context = GetCrazyContext();
   crazy_context_set_java_vm(context, vm, JNI_VERSION_1_4);
 
   // Register the function that the crazy linker can call to post code
   // for later execution.
   crazy_context_set_callback_poster(context, &PostForLaterExecution, NULL);
 
   LOG_INFO("%s: Done", __FUNCTION__);
   return JNI_VERSION_1_4;
 }