diff options
author | Tao Bao <tbao@google.com> | 2015-07-15 00:52:24 +0200 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 00:52:24 +0200 |
commit | 3231c7ca7f6534adf50474c8db57b1ba3c6cfe2f (patch) | |
tree | 500677af2c571ac6f43bbc1f5b4b24d52a68d7ec /applypatch/bspatch.cpp | |
parent | am f2853e27: am 65c230f4: Merge "Revert "Zero blocks before BLKDISCARD"" (diff) | |
parent | am 0bacbfd0: Merge "recovery: Switch applypatch/ and updater/ to cpp." (diff) | |
download | android_bootable_recovery-3231c7ca7f6534adf50474c8db57b1ba3c6cfe2f.tar android_bootable_recovery-3231c7ca7f6534adf50474c8db57b1ba3c6cfe2f.tar.gz android_bootable_recovery-3231c7ca7f6534adf50474c8db57b1ba3c6cfe2f.tar.bz2 android_bootable_recovery-3231c7ca7f6534adf50474c8db57b1ba3c6cfe2f.tar.lz android_bootable_recovery-3231c7ca7f6534adf50474c8db57b1ba3c6cfe2f.tar.xz android_bootable_recovery-3231c7ca7f6534adf50474c8db57b1ba3c6cfe2f.tar.zst android_bootable_recovery-3231c7ca7f6534adf50474c8db57b1ba3c6cfe2f.zip |
Diffstat (limited to '')
-rw-r--r-- | applypatch/bspatch.cpp (renamed from applypatch/bspatch.c) | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/applypatch/bspatch.c b/applypatch/bspatch.cpp index b57760eda..9d201b477 100644 --- a/applypatch/bspatch.c +++ b/applypatch/bspatch.cpp @@ -182,10 +182,9 @@ int ApplyBSDiffPatchMem(const unsigned char* old_data, ssize_t old_size, printf("failed to bzinit extra stream (%d)\n", bzerr); } - *new_data = malloc(*new_size); + *new_data = reinterpret_cast<unsigned char*>(malloc(*new_size)); if (*new_data == NULL) { - printf("failed to allocate %ld bytes of memory for output file\n", - (long)*new_size); + printf("failed to allocate %zd bytes of memory for output file\n", *new_size); return 1; } |