解决 parse_params 缓冲区溢出问题，解决 ffrdp & avkcp android 平台 app 退出时报错的问题

rockcarry · Nov 25, 2020 · c5015e9 · c5015e9
1 parent d9db96b
commit c5015e9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/avkcpdemuxer/avkcpd.c b/avkcpdemuxer/avkcpd.c
@@ -71,7 +71,7 @@ static char* parse_params(const char *str, const char *key, char *val, int len)
         }
         val[i] = *p++;
     }
-    val[i] = val[len-1] = '\0';
+    val[i < len ? i : len - 1] = '\0';
     return val;
 }
 
@@ -157,6 +157,8 @@ static int avkcpc_callback(void *ctxt, int type, char *rbuf, int rbsize, int rbh
                 if (avcodec_open2(hwctxt, hwdec, NULL) == 0) {
                    *avkcpd->vcodec_context = hwctxt;
                 } else {
+                    hwctxt->extradata_size = 0;
+                    hwctxt->extradata      = NULL;
                     avkcpd->cmnvars->init_params->video_hwaccel = 0;
                     avcodec_close(hwctxt);
                     avcodec_free_context(&hwctxt);
@@ -260,6 +262,8 @@ void avkcpdemuxer_exit(void *ctxt)
 {
     AVKCPDEMUXER *avkcpd = (AVKCPDEMUXER*)ctxt;
     if (avkcpd) {
+        (*avkcpd->vcodec_context)->extradata_size = 0;
+        (*avkcpd->vcodec_context)->extradata      = NULL;
         avcodec_close(*avkcpd->acodec_context);
         avcodec_close(*avkcpd->vcodec_context);
         avcodec_free_context(avkcpd->acodec_context);

diff --git a/ffrdpdemuxer/ffrdpd.c b/ffrdpdemuxer/ffrdpd.c
@@ -72,7 +72,7 @@ static char* parse_params(const char *str, const char *key, char *val, int len)
         }
         val[i] = *p++;
     }
-    val[i] = val[len-1] = '\0';
+    val[i < len ? i : len - 1] = '\0';
     return val;
 }
 
@@ -158,6 +158,8 @@ static int ffrdpc_callback(void *ctxt, int type, char *rbuf, int rbsize, int rbh
                 if (avcodec_open2(hwctxt, hwdec, NULL) == 0) {
                    *ffrdpd->vcodec_context = hwctxt;
                 } else {
+                    hwctxt->extradata_size = 0;
+                    hwctxt->extradata      = NULL;
                     ffrdpd->cmnvars->init_params->video_hwaccel = 0;
                     avcodec_close(hwctxt);
                     avcodec_free_context(&hwctxt);
@@ -261,6 +263,8 @@ void ffrdpdemuxer_exit(void *ctxt)
 {
     FFRDPDEMUXER *ffrdpd = (FFRDPDEMUXER*)ctxt;
     if (ffrdpd) {
+        (*ffrdpd->vcodec_context)->extradata_size = 0;
+        (*ffrdpd->vcodec_context)->extradata      = NULL;
         avcodec_close(*ffrdpd->acodec_context);
         avcodec_close(*ffrdpd->vcodec_context);
         avcodec_free_context(ffrdpd->acodec_context);

diff --git a/src/ffplayer.c b/src/ffplayer.c
@@ -1058,7 +1058,7 @@ static char* parse_params(const char *str, const char *key, char *val, int len)
         }
         val[i] = *p++;
     }
-    val[i] = val[len-1] = '\0';
+    val[i < len ? i : len - 1] = '\0';
     return val;
 }