aboutsummaryrefslogtreecommitdiffstats
path: root/android/charmap.c
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2009-09-23 14:55:52 -0700
committerDavid 'Digit' Turner <digit@google.com>2009-09-23 14:55:52 -0700
commitc3e6bb48bc36d7e1b95bff7c870b0842eb8a452e (patch)
tree683eca1d9ed840b1fb153bc9a39679415fb75c00 /android/charmap.c
parent52195e705c10ab94c2b842591bbd2fda60e13102 (diff)
downloadexternal_qemu-c3e6bb48bc36d7e1b95bff7c870b0842eb8a452e.zip
external_qemu-c3e6bb48bc36d7e1b95bff7c870b0842eb8a452e.tar.gz
external_qemu-c3e6bb48bc36d7e1b95bff7c870b0842eb8a452e.tar.bz2
Fix emulator crash on exit, due to invalid free() call.
Diffstat (limited to 'android/charmap.c')
-rw-r--r--android/charmap.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/android/charmap.c b/android/charmap.c
index 23f65fa..a313312 100644
--- a/android/charmap.c
+++ b/android/charmap.c
@@ -263,7 +263,7 @@ static const AKeyCharmap _qwerty2_charmap =
};
/* Custom character map created with -charmap option. */
-AKeyCharmap android_custom_charmap = { 0 };
+static AKeyCharmap android_custom_charmap = { 0 };
const AKeyCharmap** android_charmaps = 0;
int android_charmap_count = 0;
@@ -721,15 +721,6 @@ android_charmap_setup(const char* kcm_file_path) {
void
android_charmap_done(void) {
if (NULL != android_charmaps) {
- int n;
- for (n = 0; n < android_charmap_count; n++) {
- // Entries for qwerty and qwerty2 character maps are
- // static entries defined in charmap.c
- if ((&_qwerty_charmap != android_charmaps[n]->entries) &&
- (&_qwerty2_charmap != android_charmaps[n]->entries)) {
- qemu_free((void*)android_charmaps[n]->entries);
- }
- }
qemu_free(android_charmaps);
}
}