Merge branch '2.0release' into develop

winlin
Commit 77bca7cc05ceab0e69cc0f3b71775f786c4d9cd7 77bca7cc 2 parents 6b8fe92a 53d2eb5e
trunk/src/libs/srs_librtmp.cpp
--- a/trunk/src/libs/srs_librtmp.cpp
查看文件 @77bca7c
+++ b/trunk/src/libs/srs_librtmp.cpp
查看文件 @77bca7c
@@ -2028,6 +2028,9 @@ int64_t srs_utils_send_bytes(srs_rtmp_t rtmp)
 {
     srs_assert(rtmp != NULL);
     Context* context = (Context*)rtmp;
+    if (!context->rtmp) {
+        return 0;
+    }
     return context->rtmp->get_send_bytes();
 }
@@ -2035,6 +2038,9 @@ int64_t srs_utils_recv_bytes(srs_rtmp_t rtmp)
 {
     srs_assert(rtmp != NULL);
     Context* context = (Context*)rtmp;
+    if (!context->rtmp) {
+        return 0;
+    }
     return context->rtmp->get_recv_bytes();
 }