Changeset 35700

Timestamp:

2021-10-25T00:39:08+13:00 (2 years ago)

Author:

davidb

Message:

Some additional checking added in

File:

• main/trunk/search4j/libsearch4j.cpp (modified) (2 diffs)

main/trunk/search4j/libsearch4j.cpp

@@ -342 +342 @@
 char* get_dirname (const char* full_file_path)
 {
-  char* full_file_path_dup = strdup(full_file_path);
+  char* parent_dir = NULL;
+  
+  if (full_file_path != NULL) {
+  
+    char* full_file_path_dup = strdup(full_file_path);
 #ifdef WINDOWS
-  char *p = strrchr(full_file_path_dup, '\\');
+    char *p = strrchr(full_file_path_dup, '\\');
 #else
-  char *p = strrchr(full_file_path_dup, '/');
+    char *p = strrchr(full_file_path_dup, '/');
 #endif
 
-  if (p != NULL) {
-    p[0] = 0;
+    if (p != NULL) {
+      // truncate the string at the point where the dir-separator was found
+      p[0] = 0; 
+      parent_dir = full_file_path_dup;
+    }
+    else {
+      // no dir-separator found
+      free(full_file_path_dup);
+      full_file_path_dup = NULL;
+    }
   }
-    
-  return full_file_path_dup;
+      
+  return parent_dir;
 }
 
@@ -578 +590 @@
 
           char* parent_dir = get_dirname(full_path_java);
-          char* parent_parent_dir = get_dirname(parent_dir);
+          char* parent_parent_dir = get_dirname(parent_dir); 
           
           javaHomeEnv = parent_parent_dir; 
 
-          free(parent_dir); 
+          if (parent_dir != NULL) {
+            free(parent_dir);
+          }
           
           // Logic from here same as for other search4j java/javac testing
-          if ( verbose ) cout << "(" << javaHomeEnv << ") ";
-          jvm.setJavaHome( javaHomeEnv );
-          if ( jvm.check() ) {
-            if ( use_minimum ) {
-              if ( jvm.compare( minimum ) >= 0 ) {
+          if (javaHomeEnv != NULL) {
+            if ( verbose ) cout << "(" << javaHomeEnv << ") ";
+            jvm.setJavaHome( javaHomeEnv );
+            if ( jvm.check() ) {
+              if ( use_minimum ) {
+            if ( jvm.compare( minimum ) >= 0 ) {
+              jvmFound = true;
+            }
+              } else {
             jvmFound = true;
               }
-            } else {
-              jvmFound = true;
             }
+            if ( (jreOnly && !jvm.getIsJre() ) || (jdkOnly && !jvm.getIsJdk()) ) {
+              jvmFound = false;
+            }         
           }
-          if ( (jreOnly && !jvm.getIsJre() ) || (jdkOnly && !jvm.getIsJdk()) ) {
-            jvmFound = false;
-          }
-          
         }
         if ( verbose ) { if( jvmFound ) cout << "yes" << endl; else cout << "no" << endl; }