aboutsummaryrefslogtreecommitdiffstats
path: root/android
diff options
context:
space:
mode:
authorDavid Turner <>2009-03-27 16:32:47 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-27 16:32:47 -0700
commita780727a390971e6cdc11cbe82c6a66052498212 (patch)
tree3429250a67c6f3000edd3739360c0e7ca50c20e9 /android
parentb58c44e55548129243185ef5927bd3abb5903044 (diff)
downloadexternal_qemu-a780727a390971e6cdc11cbe82c6a66052498212.zip
external_qemu-a780727a390971e6cdc11cbe82c6a66052498212.tar.gz
external_qemu-a780727a390971e6cdc11cbe82c6a66052498212.tar.bz2
AI 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/... Automated import of CL 143179
Diffstat (limited to 'android')
-rw-r--r--android/avd/info.c1
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) {