diff options
| author | Elliott Hughes <enh@google.com> | 2013-10-29 18:31:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-29 18:31:01 -0700 |
| commit | 9259663cdb8f15226844e3ecfc6e3aa53614ad03 (patch) | |
| tree | e8c859373e4a64fde3f073bc4601947bae5763f4 /adb | |
| parent | 0433d62291c4e847ae90a6f0a8f264329e1e5617 (diff) | |
| parent | f17f55914e18eb176ccc5bb8266b248ece8cb56b (diff) | |
| download | system_core-9259663cdb8f15226844e3ecfc6e3aa53614ad03.zip system_core-9259663cdb8f15226844e3ecfc6e3aa53614ad03.tar.gz system_core-9259663cdb8f15226844e3ecfc6e3aa53614ad03.tar.bz2 | |
am f17f5591: am 36d44740: Merge "Fix a bunch of small system/core bugs."
* commit 'f17f55914e18eb176ccc5bb8266b248ece8cb56b':
Fix a bunch of small system/core bugs.
Diffstat (limited to 'adb')
| -rw-r--r-- | adb/file_sync_client.c | 2 | ||||
| -rw-r--r-- | adb/file_sync_service.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/adb/file_sync_client.c b/adb/file_sync_client.c index 354d0fb..9fec081 100644 --- a/adb/file_sync_client.c +++ b/adb/file_sync_client.c @@ -642,8 +642,8 @@ static int local_build_list(copyinfo **filelist, ci = mkcopyinfo(lpath, rpath, name, 0); if(lstat(ci->src, &st)) { fprintf(stderr,"cannot stat '%s': %s\n", ci->src, strerror(errno)); + free(ci); closedir(d); - return -1; } if(!S_ISREG(st.st_mode) && !S_ISLNK(st.st_mode)) { diff --git a/adb/file_sync_service.c b/adb/file_sync_service.c index d3e841b..f24f14c 100644 --- a/adb/file_sync_service.c +++ b/adb/file_sync_service.c @@ -110,6 +110,7 @@ static int do_list(int s, const char *path) if(writex(s, &msg.dent, sizeof(msg.dent)) || writex(s, de->d_name, len)) { + closedir(d); return -1; } } |