Merge change 916
* changes:
Fix a potential integer overflow bug that could result in memory overwrites. Also add a check to the result of malloc()
diff --git a/adb/Android.mk b/adb/Android.mk
index 2296610..c8606cf 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -7,7 +7,6 @@
# adb host tool
# =========================================================
-ifneq ($(TARGET_SIMULATOR),true) # not 64 bit clean (also unused with the sim)
include $(CLEAR_VARS)
# Default to a virtual (sockets) usb interface
@@ -77,7 +76,6 @@
$(LOCAL_INSTALLED_MODULE): $(HOST_OUT_EXECUTABLES)/AdbWinApi.dll
endif
-endif
# adbd device daemon
# =========================================================
diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 95e20b5..850e10b 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -222,6 +222,7 @@
" -p <product> specify product name\n"
" -c <cmdline> override kernel commandline\n"
" -i <vendor id> specify a custom USB vendor id\n"
+ " -b <base_addr> specify a custom kernel base address\n"
);
exit(1);
}