commit 983b8bb01c3abc8e338f7779ee62fd6aab2f56a0
author Elliott Hughes <enh@google.com> Wed Sep 09 10:49:30 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 09 10:49:30 2009 -0700
tree 991c70bf8d6f39768a5ab4a5c3f468dbdae4e92f
parent b97d616d028f801b6e914c9a29d9177de2177020
parent d9a16d6e7daf8e58ebc7760530d9b015dbe4678d

am d9a16d6e: Merge change 23852 into eclair

Merge commit 'd9a16d6e7daf8e58ebc7760530d9b015dbe4678d' into eclair-plus-aosp

* commit 'd9a16d6e7daf8e58ebc7760530d9b015dbe4678d':
  Fix a call to memset(3) with reversed arguments.

libzipfile/centraldir.c

diff --git a/libzipfile/centraldir.c b/libzipfile/centraldir.c
index 0391c09..0e264a3 100644
--- a/libzipfile/centraldir.c
+++ b/libzipfile/centraldir.c
@@ -233,7 +233,7 @@
     len = (buf+bufsize)-p;

     for (i=0; i < file->totalEntryCount; i++) {

         Zipentry* entry = malloc(sizeof(Zipentry));

-        memset(entry, sizeof(Zipentry), 0);

+        memset(entry, 0, sizeof(Zipentry));

 

         err = read_central_directory_entry(file, entry, &p, &len);

         if (err != 0) {