harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r607409 - /harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c
Date Sat, 29 Dec 2007 10:23:23 GMT
Author: varlax
Date: Sat Dec 29 02:23:21 2007
New Revision: 607409

URL: http://svn.apache.org/viewvc?rev=607409&view=rev
Log:
Fixed HARMONY-5358 [classlib][luni] hyluni lib crashes if bootclasspath.properties has blanks-only
line

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c?rev=607409&r1=607408&r2=607409&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/shared/luniglob.c Sat
Dec 29 02:23:21 2007
@@ -346,10 +346,6 @@
             returnCode = JNI_ERR;
             goto cleanup;
         }
-        if (!bootstrapClassPath) {
-            /* no such property yet */
-            bootstrapClassPath = "";
-        }
 
         qsort(props, number, sizeof(key_value_pair), props_compare);
 
@@ -362,11 +358,13 @@
             if (tokensScanned == 1)
             {
                 char *oldPath = bootstrapClassPath;
-                bootstrapClassPath = str_concat (PORTLIB, 
-                    bootstrapClassPath, cpSeparator,
-                    bootDirectory, props[i].value, NULL);
-                if (i != 0) 
-                {
+                if (!oldPath) {
+                    bootstrapClassPath = str_concat (PORTLIB, 
+                        bootDirectory, props[i].value, NULL);
+                } else {
+                    bootstrapClassPath = str_concat (PORTLIB, 
+                        bootstrapClassPath, cpSeparator,
+                        bootDirectory, props[i].value, NULL);
                     hymem_free_memory (oldPath);
                 }
 



Mime
View raw message