diff options
| author | Valerio Pilo <vpilo@coldshock.net> | 2014-04-14 23:34:04 +0200 |
|---|---|---|
| committer | Valerio Pilo <vpilo@coldshock.net> | 2014-04-14 23:34:04 +0200 |
| commit | c832b022eea69c219aa9f2d5fc8cbffd73f12c6f (patch) | |
| tree | 32f7a864032c17b80c0cd6a73bf55757b85b39c1 | |
| parent | ab552db30f9daae330d01c899ef242b84cd6b83f (diff) | |
| download | android_hardware_ril-c832b022eea69c219aa9f2d5fc8cbffd73f12c6f.tar.gz android_hardware_ril-c832b022eea69c219aa9f2d5fc8cbffd73f12c6f.tar.bz2 android_hardware_ril-c832b022eea69c219aa9f2d5fc8cbffd73f12c6f.zip | |
rild: Fix crash when using the emulatorcm-11.0-XNPH44S-bacon-5fa8c79c0bcm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505acm-11.0-XNPH25R-bacon-d22b777afacm-11.0-XNPH22R-bacon-03d77315ea
MSIM support introduced a new rild parameter, but it was not properly checked.
Change-Id: I8dab3b61be2b4d09e095e8ba5ca325cf0ea527c1
| -rw-r--r-- | reference-ril/reference-ril.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/reference-ril/reference-ril.c b/reference-ril/reference-ril.c index 0a013e5..81fbeee 100644 --- a/reference-ril/reference-ril.c +++ b/reference-ril/reference-ril.c @@ -3336,7 +3336,8 @@ mainLoop(void *param) * emulator), we will try to connecto to gsm service via * qemu pipe. */ char qemuPipe[MAX_QEMU_PIPE_NAME_LENGTH] = "qemud:gsm"; - if (strncmp(ril_inst_id, "0", MAX_CLIENT_ID_LENGTH)) { + if (ril_inst_id != NULL + && strlen(ril_inst_id) <= MAX_CLIENT_ID_LENGTH ) { strncat(qemuPipe, ril_inst_id ,MAX_QEMU_PIPE_NAME_LENGTH); } RLOGD("qemu pipe name : %s\n", qemuPipe); |