Don't leak upon failed realloc.

libjava
2008-03-10  Jim Meyering  <meyering@redhat.com>
        Don't leak upon failed realloc.
        * gnu/classpath/natSystemProperties.cc
        (SystemProperties::insertSystemProperties):
libjava/classpath
2008-03-10  Jim Meyering  <meyering@redhat.com>
        Don't leak upon failed realloc.
        * native/jni/classpath/jcl.c (JCL_realloc): Upon failed realloc,
        free the original buffer before throwing the exception.

From-SVN: r133094

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index cbffc7c02c781e9231874da3cbdeaea9dfd6f2fe..84ea6c0b3be285bac5054a7dc9b4a948fb1afbf6 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-10  Jim Meyering  <meyering@redhat.com>
+
+       Don't leak upon failed realloc.
+       * gnu/classpath/natSystemProperties.cc
+       (SystemProperties::insertSystemProperties):
+
 2008-03-06  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * HACKING: Fix grep patterns.

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 1a39f6b48d5b9beddd7876db2df23e807fd8ff1a..c3d8f6395b6051ef69fbae335a2cb3adfb2fdb27 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-10  Jim Meyering  <meyering@redhat.com>
+
+       Don't leak upon failed realloc.
+       * native/jni/classpath/jcl.c (JCL_realloc): Upon failed realloc,
+       free the original buffer before throwing the exception.
+
 2008-03-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * doc/cp-hacking.texinfo: Fix spacing after periods.

diff --git a/libjava/classpath/native/jni/classpath/jcl.c b/libjava/classpath/native/jni/classpath/jcl.c
index cd3f5161d06984501999eb971c96c39f04f5e2ef..0180ab9f0f58e756fc1dd35172d24fce2a72b172 100644 (file)
--- a/libjava/classpath/native/jni/classpath/jcl.c
+++ b/libjava/classpath/native/jni/classpath/jcl.c
@@ -1,5 +1,5 @@
 /* jcl.c
-   Copyright (C) 1998, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2005, 2006, 2008 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -152,9 +152,11 @@ JCL_malloc (JNIEnv * env, size_t size)
 JNIEXPORT void *JNICALL
 JCL_realloc (JNIEnv * env, void *ptr, size_t size)
 {
+  void *orig_ptr = ptr;
   ptr = realloc (ptr, size);
   if (ptr == 0)
     {
+      free (orig_ptr);
       JCL_ThrowException (env, "java/lang/OutOfMemoryError",
                          "malloc() failed.");
       return NULL;

diff --git a/libjava/gnu/classpath/natSystemProperties.cc b/libjava/gnu/classpath/natSystemProperties.cc
index 089a14e5b4ec4a5df310969ca1d22589a07c71d8..e259304b165c2393638e5bd556acc1a86aae6344 100644 (file)
--- a/libjava/gnu/classpath/natSystemProperties.cc
+++ b/libjava/gnu/classpath/natSystemProperties.cc
@@ -270,7 +270,10 @@ gnu::classpath::SystemProperties::insertSystemProperties (::java::util::Properti
       if (errno != ERANGE)
        break;
       buflen = 2 * buflen;
+      char *orig_buf = buffer;
       buffer = (char *) realloc (buffer, buflen);
+      if (buffer == NULL)
+       free (orig_buf);
     }
   if (buffer != NULL)
     free (buffer);