From c19d2a1d798d8626f196d878abcf23a14bee40af Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 2 Sep 2009 13:37:17 -0700
Subject: Fix two calls to memset(3) whose arguments were reversed.

External bug 3358 reported the libcore/x-net instance. Manual inspection
turned up another instance in vm, but nothing else in the dalvik package.

Tested by booting sapphire-eng and running the x-net tests.

Bug: 1999244
---
 vm/CheckJni.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'vm')

diff --git a/vm/CheckJni.c b/vm/CheckJni.c
index 2e3b1c118..bc905271b 100644
--- a/vm/CheckJni.c
+++ b/vm/CheckJni.c
@@ -998,7 +998,7 @@ static void* freeGuardedCopy(void* dataBuf)
     void* originalPtr = (void*) pExtra->originalPtr;
     size_t len = pExtra->originalLen;
 
-    memset(dataBuf, len, 0xdd);
+    memset(dataBuf, 0xdd, len);
     free(fullBuf);
     return originalPtr;
 }
@@ -2607,4 +2607,3 @@ void dvmUseCheckedJniVm(JavaVMExt* pVm)
     pVm->baseFuncTable = pVm->funcTable;
     pVm->funcTable = &gCheckInvokeInterface;
 }
-
-- 
cgit v1.2.3