diff options
| author | Andreas Huber <andih@google.com> | 2013-03-15 08:59:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-15 08:59:39 -0700 |
| commit | ee6ad3bd4bfc8e71b3b8c96eb4ea56a592e13e65 (patch) | |
| tree | 9d8653aa68467db73426cf34dabb12cdcdf4410d /media | |
| parent | 888498ec8f3c01e39bf0b202fbd926725d9d54a1 (diff) | |
| parent | 59ac7b3056db57e5a8e851b7946a181c5fc34852 (diff) | |
| download | frameworks_av-ee6ad3bd4bfc8e71b3b8c96eb4ea56a592e13e65.zip frameworks_av-ee6ad3bd4bfc8e71b3b8c96eb4ea56a592e13e65.tar.gz frameworks_av-ee6ad3bd4bfc8e71b3b8c96eb4ea56a592e13e65.tar.bz2 | |
am 59ac7b30: am 66abe3ae: Merge "Fix for crash if no content in DESCRIBE response"
* commit '59ac7b3056db57e5a8e851b7946a181c5fc34852':
Fix for crash if no content in DESCRIBE response
Diffstat (limited to 'media')
| -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 5d760d3..95ed43a 100644 --- a/media/libstagefright/rtsp/MyHandler.h +++ b/media/libstagefright/rtsp/MyHandler.h @@ -511,6 +511,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; |