diff options
| author | qsr <qsr@chromium.org> | 2014-09-26 10:07:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-26 17:07:38 +0000 |
| commit | a8af5943653de9ebabbca1ba6378ac4ac3017e2c (patch) | |
| tree | 36b7ea38b8e800d448da94df5b67ef156c0d14b1 /mojo/android | |
| parent | 55ed6724b317bb2bfef2ee8cc1603df8fb3f8223 (diff) | |
| download | chromium_src-a8af5943653de9ebabbca1ba6378ac4ac3017e2c.zip chromium_src-a8af5943653de9ebabbca1ba6378ac4ac3017e2c.tar.gz chromium_src-a8af5943653de9ebabbca1ba6378ac4ac3017e2c.tar.bz2 | |
mojo: Fix mojo test on Art runtime.
Due to the following bug:
https://code.google.com/p/android/issues/detail?id=76644, it is not
possible in art to create an empty buffer for address NULL. This solve
the issue by creating an empty buffer on a random address. This is not
an issue as the memory will never be accessed.
BUG=406848
R=ppi@chromium.org,yfriedman@chromium.org
Review URL: https://codereview.chromium.org/601163002
Cr-Commit-Position: refs/heads/master@{#296964}
Diffstat (limited to 'mojo/android')
| -rw-r--r-- | mojo/android/javatests/validation_test_util.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mojo/android/javatests/validation_test_util.cc b/mojo/android/javatests/validation_test_util.cc index 31aa369..2289e02 100644 --- a/mojo/android/javatests/validation_test_util.cc +++ b/mojo/android/javatests/validation_test_util.cc @@ -31,9 +31,13 @@ jobject ParseData(JNIEnv* env, jclass jcaller, jstring data_as_string) { return Java_ValidationTestUtil_buildData( env, NULL, 0, j_error_message.obj()).Release(); } - + void* data_ptr = &data[0]; + if (!data_ptr) { + DCHECK(!data.size()); + data_ptr = &data; + } jobject byte_buffer = - env->NewDirectByteBuffer(&data[0], data.size()); + env->NewDirectByteBuffer(data_ptr, data.size()); return Java_ValidationTestUtil_buildData(env, byte_buffer, num_handles, NULL) .Release(); } |