diff options
| author | Xuefei Chen <xuefei.chen@sonymobile.com> | 2013-01-07 16:43:13 +0800 |
|---|---|---|
| committer | Takeshi Aimi <takeshi.aimi@sonymobile.com> | 2013-03-12 19:35:23 +0900 |
| commit | 5f1897538bab324f53efc6bec65487516041f2e9 (patch) | |
| tree | 1940c0726c4f8bc9293966786c6a60c00d14ab95 | |
| parent | c0048178a1d312e7e05557ba99becd6a89b9e97a (diff) | |
| download | frameworks_av-5f1897538bab324f53efc6bec65487516041f2e9.zip frameworks_av-5f1897538bab324f53efc6bec65487516041f2e9.tar.gz frameworks_av-5f1897538bab324f53efc6bec65487516041f2e9.tar.bz2 | |
Fix for crash if no content in DESCRIBE response
If DESCRIBE response is received with status 200 but no content,
MyHandler will still set content data for session description
parsing. This will cause NULL Pointer crash.
This fix checks whether DESCRIBE response has content before
parsing session description.
Change-Id: I114ae6fd54ce804e61718f62618ca9008425a433
| -rw-r--r-- | media/libstagefright/rtsp/MyHandler.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/rtsp/MyHandler.h b/media/libstagefright/rtsp/MyHandler.h index 96c7683..b2f0e5e 100644 --- a/media/libstagefright/rtsp/MyHandler.h +++ b/media/libstagefright/rtsp/MyHandler.h @@ -422,6 +422,9 @@ struct MyHandler : public AHandler { if (response->mStatusCode != 200) { result = UNKNOWN_ERROR; + } else if (response->mContent == NULL) { + result = ERROR_MALFORMED; + ALOGE("The response has no content."); } else { mSessionDesc = new ASessionDescription; |