diff options
| author | Elliott Hughes <enh@google.com> | 2012-04-19 15:45:10 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-04-19 15:45:10 -0700 |
| commit | 53b07f7bc2fb344727511e3a1f7ce8f10e36e7b0 (patch) | |
| tree | 5ed405a2d374fb4db79d1709840b05052b5d0b34 | |
| parent | 2a3cc744730ec76a05b31df8ac5b6de538d6d70b (diff) | |
| parent | 7e2f0ea6e610787e628635f020b5b6f4e90b59f5 (diff) | |
| download | android_dalvik-53b07f7bc2fb344727511e3a1f7ce8f10e36e7b0.tar.gz android_dalvik-53b07f7bc2fb344727511e3a1f7ce8f10e36e7b0.tar.bz2 android_dalvik-53b07f7bc2fb344727511e3a1f7ce8f10e36e7b0.zip | |
Merge "Fix a small memory leak."
| -rw-r--r-- | vm/Thread.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vm/Thread.cpp b/vm/Thread.cpp index 5122adfad..8e879e084 100644 --- a/vm/Thread.cpp +++ b/vm/Thread.cpp @@ -3340,7 +3340,10 @@ std::string dvmGetThreadName(Thread* thread) { StringObject* nameObj = (StringObject*) dvmGetFieldObject(thread->threadObj, gDvm.offJavaLangThread_name); - return dvmCreateCstrFromString(nameObj); + char* name = dvmCreateCstrFromString(nameObj); + std::string result(name); + free(name); + return result; } /* |