harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r381426 - in /incubator/harmony/enhanced/classlib/trunk/native-src: linux.IA32/launcher/main.c win.IA32/launcher/main.c
Date Mon, 27 Feb 2006 20:11:48 GMT
Author: tellison
Date: Mon Feb 27 12:11:45 2006
New Revision: 381426

URL: http://svn.apache.org/viewcvs?rev=381426&view=rev
Log:
Fix for HARMONY-134 (uninitialised variables in "goto bail" code path in linux native launcher/main.c)

Modified:
    incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/main.c
    incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/main.c

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/main.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/main.c?rev=381426&r1=381425&r2=381426&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/main.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/linux.IA32/launcher/main.c Mon Feb
27 12:11:45 2006
@@ -103,9 +103,9 @@
   int i;
   char *vmdllsubdir;
   int isJvmSubDir = 0;
-  char *vmiPath;
+  char *vmiPath = NULL;
   char *newPathToAdd;
-  char *propertiesFileName;
+  char *propertiesFileName = NULL;
   char *exeName;
   char *endPathPtr;
   //jint (JNICALL *JNI_CreateJavaVM)(JavaVM**, JNIEnv**, JavaVMInitArgs*);
@@ -590,15 +590,15 @@
       noOfLauncherHomes = 0;
 
       /* count number of instances of %LAUNCHER_HOME% in String */
-      while (equalsDelimiter =
-             strstr (lineStr[l] + offset, "%LAUNCHER_HOME%"))
+      while ( (equalsDelimiter =
+             strstr (lineStr[l] + offset, "%LAUNCHER_HOME%")) )
         {
           noOfLauncherHomes++;
           offset = equalsDelimiter - lineStr[l] + 15;
           //printf("counter = %d\n",noOfLauncherHomes);
         }
       /* Allocate memory for expanding string */
-      if (equalsDelimiter = strstr (lineStr[l], "%LAUNCHER_HOME%"))
+      if ( (equalsDelimiter = strstr (lineStr[l], "%LAUNCHER_HOME%")) )
         {
           expandedLineStr[l] =
             hymem_allocate_memory (strlen (lineStr[l]) +

Modified: incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/main.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/main.c?rev=381426&r1=381425&r2=381426&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/main.c (original)
+++ incubator/harmony/enhanced/classlib/trunk/native-src/win.IA32/launcher/main.c Mon Feb
27 12:11:45 2006
@@ -104,9 +104,9 @@
   int i;
   char *vmdllsubdir;
   int isJvmSubDir = 0;
-  char *vmiPath;
+  char *vmiPath = NULL;
   char *newPathToAdd;
-  char *propertiesFileName;
+  char *propertiesFileName = NULL;
   char *exeName;
   char *endPathPtr;
   //jint (JNICALL *JNI_CreateJavaVM)(JavaVM**, JNIEnv**, JavaVMInitArgs*);
@@ -586,15 +586,15 @@
       noOfLauncherHomes = 0;
 
       /* count number of instances of %LAUNCHER_HOME% in String */
-      while (equalsDelimiter =
-        strstr (lineStr[l] + offset, "%LAUNCHER_HOME%"))
+      while ( (equalsDelimiter =
+				strstr (lineStr[l] + offset, "%LAUNCHER_HOME%")) )
         {
           noOfLauncherHomes++;
           offset = equalsDelimiter - lineStr[l] + 15;
           //printf("counter = %d\n",noOfLauncherHomes);
         }
       /* Allocate memory for expanding string */
-      if (equalsDelimiter = strstr (lineStr[l], "%LAUNCHER_HOME%"))
+      if ( (equalsDelimiter = strstr (lineStr[l], "%LAUNCHER_HOME%")) )
         {
           expandedLineStr[l] =
             hymem_allocate_memory (strlen (lineStr[l]) +



Mime
View raw message