[fix] fix a crash bug caused by streams with no meta data.

winshining · winshining · commit 2c7e1d152423 · 2019-09-11T21:15:39.000+08:00
diff --git a/ngx_rtmp_live_module.c b/ngx_rtmp_live_module.c
@@ -981,9 +981,16 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
         }
 
         if (handler->meta == NULL && meta_version != pctx->meta_version) {
-            handler->meta = handler->meta_message_pt(ss, codec_ctx->meta);
-            if (handler->meta == NULL) {
-                continue;
+            if (codec_ctx->meta) {
+                handler->meta = handler->meta_message_pt(ss, codec_ctx->meta);
+                if (handler->meta == NULL) {
+                    continue;
+                }
+            } else {
+                ngx_log_error(NGX_LOG_WARN, ss->connection->log, 0,
+                              "live: no meta");
+
+                pctx->meta_version = meta_version;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -981,9 +981,16 @@ ngx_rtmp_live_av(ngx_rtmp_session_t s, ngx_rtmp_header_t h,`
`981`	`981`	`}`
`982`	`982`
`983`	`983`	`if (handler->meta == NULL && meta_version != pctx->meta_version) {`
`984`		`- handler->meta = handler->meta_message_pt(ss, codec_ctx->meta);`
`985`		`- if (handler->meta == NULL) {`
`986`		`- continue;`
	`984`	`+ if (codec_ctx->meta) {`
	`985`	`+ handler->meta = handler->meta_message_pt(ss, codec_ctx->meta);`
	`986`	`+ if (handler->meta == NULL) {`
	`987`	`+ continue;`
	`988`	`+ }`
	`989`	`+ } else {`
	`990`	`+ ngx_log_error(NGX_LOG_WARN, ss->connection->log, 0,`
	`991`	`+ "live: no meta");`
	`992`	`+`
	`993`	`+ pctx->meta_version = meta_version;`
`987`	`994`	`}`
`988`	`995`	`}`
`989`	`996`