Initialize content with NULL in dwb_get_scripts

2 files changed, 5 insertions, 4 deletions

diff --git a/src/download.c b/src/download.c
index bf199065..067145a6 100644
--- a/src/download.c
+++ b/src/download.c
@@ -257,15 +257,16 @@ download_delay(DwbDownload *download) {
 static void
 download_status_cb(WebKitDownload *download, GParamSpec *p, DwbDownloadStatus *dstatus) {
   WebKitDownloadStatus status = webkit_download_get_status(download);
+  gboolean script_handled = false;
   if (EMIT_SCRIPT(DOWNLOAD_STATUS)) {
     ScriptSignal signal = { .jsobj = NULL, { G_OBJECT(download) }, SCRIPTS_SIG_META(NULL, DOWNLOAD_STATUS, 1) };
-    scripts_emit(&signal);
+    script_handled = scripts_emit(&signal);
   }
   if (status == WEBKIT_DOWNLOAD_STATUS_FINISHED || status == WEBKIT_DOWNLOAD_STATUS_CANCELLED || status == WEBKIT_DOWNLOAD_STATUS_ERROR) {
     GList *list = download_get_download_label(download);
     if (list) {
       DwbDownload *label = list->data;
-      if (label->action == DL_ACTION_EXECUTE && status == WEBKIT_DOWNLOAD_STATUS_FINISHED) {
+      if (label->action == DL_ACTION_EXECUTE && status == WEBKIT_DOWNLOAD_STATUS_FINISHED && !script_handled) {
         download_spawn(label);
       }
       /* Setting time to 0 will force recomputing size */
diff --git a/src/dwb.c b/src/dwb.c
index 81b86844..c283eb4e 100644
--- a/src/dwb.c
+++ b/src/dwb.c
@@ -2610,8 +2610,8 @@ dwb_execute_user_script(KeyMap *km, Arg *a) {
 static GList * 
 dwb_get_scripts() {
   GDir *dir;
-  char *filename;
-  char *content;
+  char *filename = NULL;
+  char *content = NULL;
   GList *gl = NULL;
   Navigation *n;
   GError *error = NULL;