commit 66abe3ae38665256c8fe97770f046bf9c68625aa
author Andreas Huber <andih@google.com> Fri Mar 15 15:33:00 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 15 15:33:01 2013 +0000
tree 57b4f5b294adabfa10c1060f67a828b3a82dcc81
parent f0cea9f83cf0c8e5ecdd2b401ec2d56d0c717708
parent 5f1897538bab324f53efc6bec65487516041f2e9

Merge "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;