Merge pull request #8 from datadancer/buffer-overflow-patch-1

Length checking for argument __name
SICKAG · Feb 8, 2021 · 9fbca7d · 9fbca7d
2 parents 2bfb4c8 + d66fb36
commit 9fbca7d
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/driver/src/sick_generic_caller.cpp b/driver/src/sick_generic_caller.cpp
@@ -173,6 +173,11 @@ int main(int argc, char **argv)
   {
     if (strstr(argv_tmp[i], nameId) == argv_tmp[i])
     {
+      if(strlen(argv_tmp[i] + strlen(nameId)) >= MAX_NAME_LEN){
+        ROS_ERROR("Program arguments: %s is too long.\n", nameId);
+        exit(-1);
+      }
+
       strcpy(nameVal, argv_tmp[i] + strlen(nameId));
       scannerName = nameVal;
     }