diff options
| author | Elliott Hughes <enh@google.com> | 2009-09-02 13:37:17 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2009-09-02 13:42:25 -0700 |
| commit | c19d2a1d798d8626f196d878abcf23a14bee40af (patch) | |
| tree | 3da359f85c37f7be6774f728f3433202d880514a | |
| parent | 5ca29e142032b6559824e4f7d526bbc037b90c93 (diff) | |
| download | android_dalvik-c19d2a1d798d8626f196d878abcf23a14bee40af.tar.gz android_dalvik-c19d2a1d798d8626f196d878abcf23a14bee40af.tar.bz2 android_dalvik-c19d2a1d798d8626f196d878abcf23a14bee40af.zip | |
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
| -rw-r--r-- | libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSocketImpl.cpp | 2 | ||||
| -rw-r--r-- | vm/CheckJni.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSocketImpl.cpp b/libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSocketImpl.cpp index 8f3663245..87f2af3ea 100644 --- a/libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSocketImpl.cpp +++ b/libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_OpenSSLSocketImpl.cpp @@ -421,7 +421,7 @@ typedef struct app_data { static int sslCreateAppData(SSL* ssl) { APP_DATA* data = (APP_DATA*) malloc(sizeof(APP_DATA)); - memset(data, sizeof(APP_DATA), 0); + memset(data, 0, sizeof(APP_DATA)); data->aliveAndKicking = 1; data->waitingThreads = 0; 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; } - |