fix a crash risk

binstreamio · Jan 6, 2019 · e60e735 · e60e735
1 parent 9810288
commit e60e735
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/rtsp/rtsp-client.go b/rtsp/rtsp-client.go
@@ -235,17 +235,22 @@ func (client *RTSPClient) requestStream(timeout time.Duration) (err error) {
 	headers = make(map[string]string)
 	headers["Accept"] = "application/sdp"
 	resp, err = client.Request("DESCRIBE", headers)
-	authorization, _ := client.checkAuth("DESCRIBE", resp)
-	if len(authorization) > 0 {
-		headers := make(map[string]string)
-		headers["Authorization"] = authorization
-		headers["Accept"] = "application/sdp"
-		resp, err = client.Request("DESCRIBE", headers)
-	}
 	if err != nil {
-		return err
+		if resp != nil {
+			authorization, _ := client.checkAuth("DESCRIBE", resp)
+			if len(authorization) > 0 {
+				headers := make(map[string]string)
+				headers["Authorization"] = authorization
+				headers["Accept"] = "application/sdp"
+				resp, err = client.Request("DESCRIBE", headers)
+			}
+			if err != nil {
+				return err
+			}
+		} else {
+			return err
+		}
 	}
-
 	_sdp, err := sdp.ParseString(resp.Body)
 	if err != nil {
 		return err