Merge pull request #20 from Jason-Lee0/fix

fix double free memory
Adlink-ROS · Oct 27, 2023 · 0400558 · 0400558
2 parents 52f44ee + 2fcd557
commit 0400558
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -262,7 +262,7 @@ endif()
 set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst;")
 set(CPACK_GENERATOR "DEB")
 ## Set the package version
-set(CPACK_PACKAGE_VERSION "1.3.13")
+set(CPACK_PACKAGE_VERSION "1.3.14")
 # Set the package name
 set(CPACK_PACKAGE_NAME "neuron-library")
 # Set the package file format

diff --git a/src/x86/x86.c b/src/x86/x86.c
@@ -102,7 +102,10 @@ mraa_x86_platform()
             } else {
                 platform_type = MRAA_UNKNOWN_PLATFORM;
             }
+
             free(line);
+	    line = NULL;
+
         }
         fclose(fh);
     } else {
@@ -114,15 +117,18 @@ mraa_x86_platform()
                     plat = mraa_intel_sofia_3gr();
                 }
                 free(line);
-            }
+		line = NULL;
+	 }
             fclose(fh);
         }
     }
+
     if (platform_type == MRAA_UNKNOWN_PLATFORM){
         FILE* file_hold = fopen("/sys/devices/virtual/dmi/id/product_name", "r");
+
         if (file_hold != NULL) {
             if (getline(&line, &len, file_hold) != -1) {
-                line[strcspn(line, "\r\n")] = 0;
+		line[strcspn(line, "\r\n")] = 0;
                 if (strncmp(line, "ROScube-I", strlen("ROScube-I")) == 0 ) {
                     // includes ROScube-I, ROScube-I ET
                     platform_type = MRAA_ADLINK_ROSCUBE_I;
@@ -131,7 +137,9 @@ mraa_x86_platform()
                     syslog(LOG_ERR, "Platform not supported, not initialising");
                     platform_type = MRAA_UNKNOWN_PLATFORM;
                 }
+
                 free(line);
+		 line = NULL;
             }
             fclose(file_hold);
         }