commit be69fcbe131881b776dac0d938611b5e60aa9650
author Andreas Huber <andih@google.com> Fri Mar 15 16:00:58 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 15 16:00:58 2013 +0000
tree 9941428ca273e55c1549c4cd05139f1d12be8b30
parent 0d6e674dd5750e4624b425021ad674a8867e4895
parent 4f4c2655dc3f6fcef766db6e793b1642ad0fd605

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

* commit 'ee6ad3bd4bfc8e71b3b8c96eb4ea56a592e13e65':
  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 5d760d3..95ed43a 100644
--- a/media/libstagefright/rtsp/MyHandler.h
+++ b/media/libstagefright/rtsp/MyHandler.h
@@ -511,6 +511,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;