commit 59ac7b3056db57e5a8e851b7946a181c5fc34852
author Andreas Huber <andih@google.com> Fri Mar 15 08:57:10 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 15 08:57:10 2013 -0700
tree 57b4f5b294adabfa10c1060f67a828b3a82dcc81
parent c44a3ae2704af52c0f4ea006b5b02a53b6df6c46
parent 66abe3ae38665256c8fe97770f046bf9c68625aa

am 66abe3ae: Merge "Fix for crash if no content in DESCRIBE response"

* commit '66abe3ae38665256c8fe97770f046bf9c68625aa':
  Fix for crash if no content in DESCRIBE response

media/libstagefright/rtsp/MyHandler.h

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 @@
 
                     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;