Sidebar patch replaced with the one written by Stuart Henderson (Closes: 619822)

[software/mutt-debian.git] / hook.c

diff --git a/hook.c b/hook.c
index 8df5781b65eb5a7f1d369d0ff9a3c20a77cf3eaa..2e442984595d30a91ab77c5b0a5f67eaa4610081 100644 (file)
--- a/hook.c
+++ b/hook.c
@@ -172,7 +172,6 @@ int mutt_parse_hook (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
 #endif /* M_CRYPTHOOK */
     {
       regerror (rc, rx, err->data, err->dsize);
-      regfree (rx);
       FREE (&rx);
       goto error;
     }
@@ -460,11 +459,19 @@ char *mutt_crypt_hook (ADDRESS *adr)
 #ifdef USE_SOCKET
 void mutt_account_hook (const char* url)
 {
+  /* parsing commands with URLs in an account hook can cause a recursive
+   * call. We just skip processing if this occurs. Typically such commands
+   * belong in a folder-hook -- perhaps we should warn the user. */
+  static int inhook = 0;
+
   HOOK* hook;
   BUFFER token;
   BUFFER err;
   char buf[STRING];
 
+  if (inhook)
+    return;
+
   err.data = buf;
   err.dsize = sizeof (buf);
   memset (&token, 0, sizeof (token));
@@ -476,14 +483,19 @@ void mutt_account_hook (const char* url)
 
     if ((regexec (hook->rx.rx, url, 0, NULL, 0) == 0) ^ hook->rx.not)
     {
+      inhook = 1;
+
       if (mutt_parse_rc_line (hook->command, &token, &err) == -1)
       {
        FREE (&token.data);
        mutt_error ("%s", err.data);
        mutt_sleep (1);
 
+        inhook = 0;
        return;
       }
+
+      inhook = 0;
     }
   }