commit d483c20a7e459bd2f8e5e134355a923282175977
author Yabin Cui <yabinc@google.com> Wed Feb 03 17:08:52 2016 -0800
committer Yabin Cui <yabinc@google.com> Thu Feb 04 15:42:02 2016 -0800
tree 2d58c7fef39fbce4e6e46bcd0f6f8e9bb83204c1
parent 6e71c90fadbae68824116276d4dd536d962838f8

applypatch: fix memory leaks reported by static analysis.

Bug: 26906416
Change-Id: I163df5a8f3abda3ba5d4ed81dfc8567054eceb27

applypatch/applypatch.h

diff --git a/applypatch/applypatch.h b/applypatch/applypatch.h
index e0df104..14fb490 100644
--- a/applypatch/applypatch.h
+++ b/applypatch/applypatch.h
@@ -18,6 +18,9 @@
 #define _APPLYPATCH_H
 
 #include <sys/stat.h>
+
+#include <vector>
+
 #include "openssl/sha.h"
 #include "edify/expr.h"
 
@@ -68,22 +71,22 @@
 int FindMatchingPatch(uint8_t* sha1, char* const * const patch_sha1_str,
                       int num_patches);
 
-// bsdiff.c
+// bsdiff.cpp
 void ShowBSDiffLicense();
 int ApplyBSDiffPatch(const unsigned char* old_data, ssize_t old_size,
                      const Value* patch, ssize_t patch_offset,
                      SinkFn sink, void* token, SHA_CTX* ctx);
 int ApplyBSDiffPatchMem(const unsigned char* old_data, ssize_t old_size,
                         const Value* patch, ssize_t patch_offset,
-                        unsigned char** new_data, ssize_t* new_size);
+                        std::vector<unsigned char>* new_data);
 
-// imgpatch.c
+// imgpatch.cpp
 int ApplyImagePatch(const unsigned char* old_data, ssize_t old_size,
                     const Value* patch,
                     SinkFn sink, void* token, SHA_CTX* ctx,
                     const Value* bonus_data);
 
-// freecache.c
+// freecache.cpp
 int MakeFreeSpaceOnCache(size_t bytes_needed);
 
 #endif