tree-wide: fix uaf bugs

1 files changed, 5 insertions, 8 deletions

diff --git a/src/extractors/bilibili.c b/src/extractors/bilibili.c
index c4a628f..6112bef 100644
--- a/src/extractors/bilibili.c
+++ b/src/extractors/bilibili.c
@@ -381,7 +381,7 @@ static int download(Bilibili_options *bilibili_options) {
   get(bilibili_options->api, &resp);
   if (get_dash(resp, &dash)) {
     LOG("Bilibili", "Get dash failed.");
-    free_and_nullify((void **)&resp);
+    free_and_nullify(resp);
     dash_cleanup(&dash);
     return 1;
   };
@@ -414,7 +414,6 @@ static int download(Bilibili_options *bilibili_options) {
     }
     set_str_element(&callback_struct, 1, videofn);
     add_url(video->baseUrl, NULL, videofn, NULL, NULL);
-    free_and_nullify((void **)&videofn);
   }
 
   {
@@ -429,10 +428,8 @@ static int download(Bilibili_options *bilibili_options) {
     }
     set_str_element(&callback_struct, 2, audiofn);
     add_url(audio->baseUrl, NULL, audiofn, &bilibili_merge, &callback_struct);
-    free_and_nullify((void **)&audiofn);
   }
-  free_and_nullify((void **)&filename);
-  free_and_nullify((void **)&resp);
+  free_and_nullify(resp);
   dash_cleanup(&dash);
   return 0;
 }
@@ -481,18 +478,18 @@ void bilibili_extract(struct options *options) {
   DEBUG_PRINT("title: %s\n", bilibili_options.title);
 
   if (generate_api(&bilibili_options, 127)) {
-    free_and_nullify((void **)&bilibili_options.api);
+    free_and_nullify(bilibili_options.api);
     multipage_cleanup(&multipage_struct);
     return;
   }
   DEBUG_PRINT("Generated API: %s\n", bilibili_options.api);
 
   if (download(&bilibili_options)) {
-    free_and_nullify((void **)&bilibili_options.api);
+    free_and_nullify(bilibili_options.api);
     multipage_cleanup(&multipage_struct);
     return;
   }
 
-  free_and_nullify((void **)&bilibili_options.api);
+  free_and_nullify(bilibili_options.api);
   multipage_cleanup(&multipage_struct);
 }