packages: pound/MultipleAddHeaderHonored.diff - just in case: do not free(N...

[glen]

Author: glen                         Date: Fri Dec  9 19:29:22 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- just in case: do not free(NULL)

---- Files affected:
packages/pound:
   MultipleAddHeaderHonored.diff (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/pound/MultipleAddHeaderHonored.diff
diff -u packages/pound/MultipleAddHeaderHonored.diff:1.1 packages/pound/MultipleAddHeaderHonored.diff:1.2
--- packages/pound/MultipleAddHeaderHonored.diff:1.1	Fri Dec  9 18:17:22 2011
+++ packages/pound/MultipleAddHeaderHonored.diff	Fri Dec  9 20:29:17 2011
@@ -38,8 +38,8 @@
 francisco.ruiz(at)juntaextremadura.es
 
 Ahorrar papel protege el medio ambiente
---- config.c.orig	2010-02-02 12:49:02.000000000 +0100
-+++ config.c	2011-11-14 21:52:49.000000000 +0100
+--- Pound-2.5/config.c	2011-12-09 21:06:52.351470209 +0200
++++ Pound-2.5/config.c	2011-12-09 21:06:52.351470209 +0200
 @@ -625,6 +625,7 @@
  parse_HTTP(void)
  {
@@ -48,7 +48,7 @@
      LISTENER    *res;
      SERVICE     *svc;
      MATCHER     *m;
-@@ -719,8 +720,18 @@
+@@ -719,8 +720,19 @@
                  conf_err("HeadRemove bad pattern - aborted");
          } else if(!regexec(&AddHeader, lin, 4, matches, 0)) {
              lin[matches[1].rm_eo] = '\0';
@@ -64,12 +64,13 @@
 +                  conf_err("AddHeader config: out of memory - aborted");
 +              sprintf(ah, "%s\r\n%s", res->add_head, lin + matches[1].rm_so);
 +            }
-+            free(res->add_head);
++            if (res->add_head)
++               free(res->add_head);
 +            res->add_head = ah;
          } else if(!regexec(&RewriteLocation, lin, 4, matches, 0)) {
              res->rewr_loc = atoi(lin + matches[1].rm_so);
          } else if(!regexec(&RewriteDestination, lin, 4, matches, 0)) {
-@@ -772,6 +783,7 @@
+@@ -772,6 +785,7 @@
  parse_HTTPS(void)
  {
      char        lin[MAXBUF];
@@ -77,7 +78,7 @@
      LISTENER    *res;
      SERVICE     *svc;
      MATCHER     *m;
-@@ -902,8 +914,18 @@
+@@ -902,8 +916,19 @@
              }
          } else if(!regexec(&AddHeader, lin, 4, matches, 0)) {
              lin[matches[1].rm_eo] = '\0';
@@ -93,13 +94,14 @@
 +                  conf_err("AddHeader config: out of memory - aborted");
 +              sprintf(ah, "%s\r\n%s", res->add_head, lin + matches[1].rm_so);
 +            }
-+            free(res->add_head);
++            if (res->add_head)
++               free(res->add_head);
 +            res->add_head = ah;
          } else if(!regexec(&Ciphers, lin, 4, matches, 0)) {
              lin[matches[1].rm_eo] = '\0';
              SSL_CTX_set_cipher_list(res->ctx, lin + matches[1].rm_so);
---- pound.h.orig	2010-02-02 12:49:02.000000000 +0100
-+++ pound.h	2011-11-15 21:40:40.000000000 +0100
+--- ./pound.h.orig	2010-02-02 12:49:02.000000000 +0100
++++ ./pound.h	2011-11-15 21:40:40.000000000 +0100
 @@ -354,7 +354,7 @@
      SSL_CTX             *ctx;       /* CTX for SSL connections */
      int                 clnt_check; /* client verification mode */
@@ -109,8 +111,8 @@
      regex_t             verb;       /* pattern to match the request verb against */
      int                 to;         /* client time-out */
      int                 has_pat;    /* was a URL pattern defined? */
---- pound.8.orig	2010-02-02 12:49:02.000000000 +0100
-+++ pound.8	2011-11-15 21:48:02.000000000 +0100
+--- ./pound.8.orig	2010-02-02 12:49:02.000000000 +0100
++++ ./pound.8	2011-11-15 21:48:02.000000000 +0100
 @@ -405,7 +405,7 @@
  .TP
  \fBAddHeader\fR "header: to add"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pound/MultipleAddHeaderHonored.diff?r1=1.1&r2=1.2&f=u