From d32b7b479fad359d7fe779a9c5b4c090cdc14b56 Mon Sep 17 00:00:00 2001 From: Xuefei Chen Date: Mon, 7 Jan 2013 16:43:13 +0800 Subject: Fix for crash if no content in DESCRIBE response If DESCRIBE response is received with status 200 but no content, MyHandler will still set content data for session description parsing. This will cause NULL Pointer crash. This fix checks whether DESCRIBE response has content before parsing session description. Change-Id: I114ae6fd54ce804e61718f62618ca9008425a433 --- media/libstagefright/rtsp/MyHandler.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'media/libstagefright/rtsp') 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; -- cgit v1.1