diff options
| author | David Turner <> | 2009-03-27 18:21:13 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-27 18:21:13 -0700 |
| commit | e8b10bc4023bf84dcdb11940bbad9baf81bdd02c (patch) | |
| tree | 3429250a67c6f3000edd3739360c0e7ca50c20e9 /android/avd/info.c | |
| parent | 2f7bb38681802b4cf6f83ea97fddcab469224f93 (diff) | |
| download | external_qemu-e8b10bc4023bf84dcdb11940bbad9baf81bdd02c.zip external_qemu-e8b10bc4023bf84dcdb11940bbad9baf81bdd02c.tar.gz external_qemu-e8b10bc4023bf84dcdb11940bbad9baf81bdd02c.tar.bz2 | |
AI 143329: am: CL 143179 am: CL 142901 Avoid a segmentation fault in the emulator when trying to use an AVD while
ANDROID_PRODUCT_OUT is not defined. Argh..
Original author: digit
Merged from: //branches/cupcake/...
Original author: android-build
Merged from: //branches/donutburger/...
Automated import of CL 143329
Diffstat (limited to 'android/avd/info.c')
| -rw-r--r-- | android/avd/info.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/android/avd/info.c b/android/avd/info.c index 2f0e5a9..11c5d19 100644 --- a/android/avd/info.c +++ b/android/avd/info.c @@ -1355,6 +1355,7 @@ avdInfo_getHwConfig( AvdInfo* i, AndroidHwConfig* hw ) iniFile_free(ini); /* special product-specific hardware configuration */ + if (i->androidOut != NULL) { char* p = strrchr(i->androidOut, '/'); if (p != NULL && p[0] != 0) { |