]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
[BUG] appsession: possible memory leak in case of out of memory condition
authorCyril Bonté <cyril.bonte@free.fr>
Sat, 9 Jan 2010 23:30:14 +0000 (00:30 +0100)
committerWilly Tarreau <w@1wt.eu>
Sat, 9 Jan 2010 23:50:14 +0000 (00:50 +0100)
I've tried to follow all the pool_alloc2/pool_free2 calls in the code
to track memory leaks. I've found one which only happens when there's
already no more memory when allocating a new appsession cookie.

src/proto_http.c

index fa8f5576822bf93f9c4e356d49c19368175974da..0e5f324f26411a4d32e4dc672dddd7bf9d68b902 100644 (file)
@@ -5957,6 +5957,7 @@ void manage_server_side_cookies(struct session *t, struct buffer *rtr)
                        if ((asession->sessid = pool_alloc2(apools.sessid)) == NULL) {
                                Alert("Not enough Memory process_srv():asession->sessid:malloc().\n");
                                send_log(t->be, LOG_ALERT, "Not enough Memory process_srv():asession->sessid:malloc().\n");
+                               t->be->htbl_proxy.destroy(asession);
                                return;
                        }
                        memcpy(asession->sessid, t->sessid, t->be->appsession_len);
@@ -5966,6 +5967,7 @@ void manage_server_side_cookies(struct session *t, struct buffer *rtr)
                        if ((asession->serverid = pool_alloc2(apools.serverid)) == NULL) {
                                Alert("Not enough Memory process_srv():asession->sessid:malloc().\n");
                                send_log(t->be, LOG_ALERT, "Not enough Memory process_srv():asession->sessid:malloc().\n");
+                               t->be->htbl_proxy.destroy(asession);
                                return;
                        }
                        asession->serverid[0] = '\0';