commit 74e272b83f3fea86fd27cf98640fa90d2945fb99
author Brian C. Young <bcyoung@google.com> Tue Apr 11 19:06:17 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 11 19:06:17 2017 +0000
tree 204c7419c4edbb437a4815e8259ed226a80611a8
parent 7623ad1541175c9e846356c5c24efb3f81aeaecb
parent b7ac692e29af9941893a3c01abef084269dfa5a6

DO NOT MERGE: Heap buffer overflow in xmlAddID am: 188e4b516f  -s ours am: da1480747f am: ce2a7a6fad  -s ours am: f33d4022b2 am: faea71fde1 am: 1b65eea994 am: e66bb5b014  -s ours am: 4d4b02988e am: f9e4a7584a am: afff933549 am: 39b86a2b87
am: b7ac692e29  -s ours

Change-Id: I9e37cae7ceddf95cde4f010e9614845ac5718584

Android.mk

diff --git a/Android.mk b/Android.mk
index f35448f..c1ae8bb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -87,7 +87,7 @@
 LOCAL_SRC_FILES := $(common_SRC_FILES)
 LOCAL_C_INCLUDES += $(common_C_INCLUDES)
 LOCAL_CFLAGS += $(common_CFLAGS) -fvisibility=hidden
-LOCAL_SHARED_LIBRARIES += libicuuc-host
+LOCAL_SHARED_LIBRARIES += libicuuc
 LOCAL_MODULE := libxml2
 LOCAL_CLANG := true
 LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk

timsort.h

diff --git a/timsort.h b/timsort.h
index 795f272..443918a 100644
--- a/timsort.h
+++ b/timsort.h
@@ -323,7 +323,7 @@
     SORT_TYPE *tempstore = (SORT_TYPE *)realloc(store->storage, new_size * sizeof(SORT_TYPE));
     if (tempstore == NULL)
     {
-      fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
+      fprintf(stderr, "Error allocating temporary storage for tim sort: need %zu bytes", sizeof(SORT_TYPE) * new_size);
       exit(1);
     }
     store->storage = tempstore;