Attachment 314117 Details for Bug 456660 – Patch from upstream CVS

[patch] Patch from upstream CVS

bug-456660.patch (text/plain), 2.42 KB, created by Josh Bressers on 2008-08-12 17:16:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Josh Bressers

Created: 2008-08-12 17:16:14 UTC

Size: 2.42 KB

patch

obsolete

>commit e27f64eb3a89d28a85b355de06ae94a602158afb
>Author: vanhu <vanhu>
>Date:   Tue Jul 22 13:25:18 2008 +0000
>
>    fixed some memory leaks, when malloc fails or when peer sends invalid proposals
>
>diff --git a/ChangeLog b/ChangeLog
>index 3d83708..4e15f5c 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,8 @@
>+2008-07-22  Yvan Vanhullebus  <vanhu@netasq.com>
>+	From Kohki Ohhira <ohhira@src.ricoh.co.jp>:
>+	* src/racoon/proposal.c: fixed some memory leaks, when malloc
>+	  fails or when peer sends invalid proposals.
>+
> 2008-07-21  Matthew Grooms
> 	* src/racoon/cfparse.y
> 	  src/racoon/cftoken.l
>diff --git a/src/racoon/proposal.c b/src/racoon/proposal.c
>index 63c047b..a05e62c 100644
>--- a/src/racoon/proposal.c
>+++ b/src/racoon/proposal.c
>@@ -1,6 +1,6 @@
>-/*	$NetBSD: proposal.c,v 1.15 2007/07/18 12:07:52 vanhu Exp $	*/
>+/*	$NetBSD: proposal.c,v 1.16 2008/07/22 13:25:18 vanhu Exp $	*/
> 
>-/* $Id: proposal.c,v 1.15 2007/07/18 12:07:52 vanhu Exp $ */
>+/* $Id: proposal.c,v 1.16 2008/07/22 13:25:18 vanhu Exp $ */
> 
> /*
>  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
>@@ -503,6 +503,7 @@ cmpsaprop_alloc(ph1, pp1, pp2, side)
> 		if (newtr == NULL) {
> 			plog(LLV_ERROR, LOCATION, NULL,
> 				"failed to allocate satrns.\n");
>+			racoon_free(newpr);
> 			goto err;
> 		}
> 		newtr->trns_no = tr1->trns_no;
>@@ -776,6 +777,7 @@ aproppair2saprop(p0)
> 		if (sizeof(newpr->spi) < p->prop->spi_size) {
> 			plog(LLV_ERROR, LOCATION, NULL,
> 				"invalid spi size %d.\n", p->prop->spi_size);
>+			racoon_free(newpr);
> 			goto err;
> 		}
> 
>@@ -810,6 +812,7 @@ aproppair2saprop(p0)
> 			if (newtr == NULL) {
> 				plog(LLV_ERROR, LOCATION, NULL,
> 					"failed to allocate satrns.\n");
>+				racoon_free(newpr);
> 				goto err;
> 			}
> 
>@@ -817,6 +820,7 @@ aproppair2saprop(p0)
> 			    newpp, newpr, newtr) < 0) {
> 				flushsaprop(newpp);
> 				racoon_free(newtr);
>+				racoon_free(newpr);
> 				return NULL;
> 			}
> 
>@@ -1154,6 +1158,7 @@ set_proposal_from_policy(iph2, sp_main, sp_sub)
> 
> 	return 0;
> err:
>+	flushsaprop(newpp);
> 	return -1;
> }
> 
>@@ -1228,6 +1233,7 @@ set_proposal_from_proposal(iph2)
> 			{
> 				plog(LLV_ERROR, LOCATION, NULL,
> 					"failed to allocate saproto.\n");
>+				racoon_free(pp0);
> 				goto end;
> 			}
> 			newpr->proto_id = pr->proto_id;
>@@ -1260,6 +1266,7 @@ set_proposal_from_proposal(iph2)
> 				plog(LLV_ERROR, LOCATION, NULL,
> 					"failed to get algorithms.\n");
> 				racoon_free(newpr);
>+				racoon_free(pp0);
> 				goto end;
> 			}
> 			inssaproto(pp0, newpr);

Actions: View | Diff

Attachments on bug 456660: 314117