diff options
| author | Andreas Huber <andih@google.com> | 2013-03-15 08:57:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-15 08:57:10 -0700 |
| commit | 3cf59c2fc80a142e19d191a923153374fb3a6c22 (patch) | |
| tree | 4b7aa22e9c773350d1f85074aa30b878b631ac6a | |
| parent | 3550ebddf61e00a5b328b4fe5709c16a8b74b273 (diff) | |
| parent | ef46e50c29935c16798b172acfb04720ff429690 (diff) | |
| download | frameworks_av-3cf59c2fc80a142e19d191a923153374fb3a6c22.zip frameworks_av-3cf59c2fc80a142e19d191a923153374fb3a6c22.tar.gz frameworks_av-3cf59c2fc80a142e19d191a923153374fb3a6c22.tar.bz2 | |
am 66abe3ae: Merge "Fix for crash if no content in DESCRIBE response"
* commit '66abe3ae38665256c8fe97770f046bf9c68625aa':
Fix for crash if no content in DESCRIBE response
| -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; |