components/lighttpd/patches/07-parfait-errors.patch
author Jiri Kukacka <jiri.kukacka@oracle.com>
Mon, 31 Mar 2014 06:47:28 -0700
branchs11-update
changeset 3053 60a045d209ef
parent 2925 d64f6e80d9b1
permissions -rw-r--r--
18450732 Upgrade lighttpd to version 1.4.35 18394858 problem in UTILITY/LIGHTTPD 18194646 Change mysql.sock path in Lighttpd modules 18172887 Prepare Lighttpd for MySQL 5.1 EOF in S12
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2925
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
     1
Developed in-house, fed to community.
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
     2
http://redmine.lighttpd.net/issues/2530
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
     3
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
     4
--- src/lempar.c	2012-08-31 07:11:20.000000000 -0700
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
     5
+++ src/lempar.c	2013-10-14 02:10:29.201323553 -0700
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
     6
@@ -486,6 +486,9 @@
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
     7
   }else if( yyact == YYNSTATE + YYNRULE + 1 ){
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
     8
     yy_accept(yypParser);
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
     9
   }
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    10
+  /* Parfait_ALLOW memory-leak - false positive for variable yygotominor - memory is properly freed in function yy_accept above */
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    11
+  /* parfait needs two comments here to stop complaining and accept Parfait_ALLOW directive, I don't know why */
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    12
+  return;
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    13
 }
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    14
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    15
 /*
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    16
--- src/mod_mysql_vhost.c	2010-08-17 02:04:38.000000000 -0700
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    17
+++ src/mod_mysql_vhost.c	2013-10-14 03:48:47.184131818 -0700
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    18
@@ -217,7 +217,10 @@
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    19
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    20
         	if (config_insert_values_global(srv,
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    21
 			((data_config *)srv->config_context->data[i])->value,
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    22
-			cv)) return HANDLER_ERROR;
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    23
+			cv)) {
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    24
+			buffer_free(sel);
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    25
+			return HANDLER_ERROR;
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    26
+		}
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    27
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    28
 		s->mysql_pre = buffer_init();
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    29
 		s->mysql_post = buffer_init();
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    30
--- src/lemon.c	2012-08-31 07:11:20.000000000 -0700
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    31
+++ src/lemon.c	2013-10-14 04:29:24.547185717 -0700
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    32
@@ -453,13 +453,11 @@
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    33
 #define acttab_yylookahead(X,N)  ((X)->aAction[N].lookahead)
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    34
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    35
 /* Free all memory associated with the given acttab */
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    36
-/*
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    37
 PRIVATE void acttab_free(acttab *p){
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    38
   free( p->aAction );
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    39
   free( p->aLookahead );
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    40
   free( p );
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    41
 }
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    42
-*/
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    43
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    44
 /* Allocate a new acttab structure */
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    45
 PRIVATE acttab *acttab_alloc(void){
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    46
@@ -3582,6 +3580,7 @@
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    47
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    48
   fclose(in);
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    49
   fclose(out);
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    50
+  acttab_free(pActtab);
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    51
   return;
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    52
 }
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    53
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    54
--- src/fdevent.c	2012-08-31 07:11:20.000000000 -0700
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    55
+++ src/fdevent.c	2013-10-14 03:55:48.707756259 -0700
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    56
@@ -77,6 +77,7 @@
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    57
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    58
 	log_error_write(ev->srv, __FILE__, __LINE__, "S",
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    59
 		"event-handler is unknown, try to set server.event-handler = \"poll\" or \"select\"");
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    60
+	free(ev);
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    61
 	return NULL;
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    62
 }
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    63
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    64
--- src/configfile.c	2012-11-07 06:50:29.000000000 -0800
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    65
+++ src/configfile.c	2013-10-15 06:45:37.918474628 -0700
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    66
@@ -1131,12 +1131,14 @@
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    67
 	context_free(&context);
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    68
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    69
 	if (0 != ret) {
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    70
+		/* Parfait_ALLOW memory-leak - false positive dcwd variable - memory is properly freed on server close */
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    71
 		return ret;
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    72
 	}
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    73
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    74
 	if (NULL != (dc = (data_config *)array_get_element(srv->config_context, "global"))) {
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    75
 		srv->config = dc->value;
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    76
 	} else {
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    77
+		/* Parfait_ALLOW memory-leak - false positive dcwd variable - memory is properly freed on server close */
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    78
 		return -1;
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    79
 	}
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    80
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    81
@@ -1146,6 +1148,7 @@
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    82
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    83
 		if (modules->type != TYPE_ARRAY) {
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    84
 			fprintf(stderr, "server.modules must be an array");
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    85
+			/* Parfait_ALLOW memory-leak - false positive dcwd variable - memory is properly freed on server close */
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    86
 			return -1;
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    87
 		}
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    88
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    89
@@ -1200,9 +1207,11 @@
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    90
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    91
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    92
 	if (0 != config_insert(srv)) {
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    93
+		/* Parfait_ALLOW memory-leak - false positive dcwd variable - memory is properly freed on server close */
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    94
 		return -1;
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    95
 	}
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    96
 
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    97
+	/* Parfait_ALLOW memory-leak - false positive dcwd variable - memory is properly freed on server close */
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    98
 	return 0;
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
    99
 }
d64f6e80d9b1 17600553 Upgrade lighttpd to version 1.4.33
Jiri Kukacka <jiri.kukacka@oracle.com>
parents:
diff changeset
   100