Attachment 172000 Details for Bug 316975 – patch v1

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch v1

patch316975_v1.diff.txt (text/plain), 1.85 KB, created by Martin Oberhuber

on 2010-06-15 18:09:04 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Oberhuber

Created: 2010-06-15 18:09:04 EDT

Size: 1.85 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.equinox.executable
>Index: library/eclipseConfig.c
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable/library/eclipseConfig.c,v
>retrieving revision 1.12
>diff -u -r1.12 eclipseConfig.c
>--- library/eclipseConfig.c	21 Jan 2008 21:55:57 -0000	1.12
>+++ library/eclipseConfig.c	15 Jun 2010 20:54:51 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2005 IBM Corporation and others.
>+ * Copyright (c) 2000, 2010 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at 
>@@ -7,6 +7,7 @@
>  * 
>  * Contributors:
>  *     IBM Corporation - initial API and implementation
>+ *	   Martin Oberhuber (Wind River) - [316975] memory leak on failure reading .ini file
>  *******************************************************************************/
> 
> #include "eclipseOS.h"
>@@ -84,10 +85,6 @@
> 	size_t bufferSize = 1024;
> 	size_t length;
> 	
>-	/* allocate buffers */
>-	buffer =  (_TCHAR*)malloc(bufferSize * sizeof(_TCHAR));
>-	argument = (_TCHAR*)malloc(bufferSize * sizeof(_TCHAR));
>-	
> 	/* Open the config file as a text file 
> 	 * Note that carriage return-linefeed combination \r\n are automatically
> 	 * translated into single linefeeds on input in the t (translated) mode
>@@ -96,6 +93,10 @@
> 	file = _tfopen(config_file, _T_ECLIPSE("rt"));	
> 	if (file == NULL) return -3;
> 
>+	/* allocate buffers */
>+	buffer =  (_TCHAR*)malloc(bufferSize * sizeof(_TCHAR));
>+	argument = (_TCHAR*)malloc(bufferSize * sizeof(_TCHAR));
>+
> 	*argv = (_TCHAR **)malloc((1 + maxArgs) * sizeof(_TCHAR*));
> 	
> 	index = 0;

Flags:

aniefer: iplog+

Actions: View | Diff

Attachments on bug 316975: 171994 | 172000