Eliminate the possibility of buffer overflow

mroonga · Jun 27, 2012 · 4cca9e5 · 4cca9e5
1 parent 8c1c6c4
commit 4cca9e5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/mrn_path_mapper.cpp b/lib/mrn_path_mapper.cpp
@@ -48,9 +48,10 @@ namespace mrn {
       return db_path_;
     }
 
+    size_t db_len = strlen(db_path_);
     if (strncmp(mysql_path_, "./", 2) == 0) {
       if (path_prefix_) {
-        strncat(db_path_, path_prefix_, MRN_MAX_PATH_SIZE);
+        strncat(db_path_, path_prefix_, MRN_MAX_PATH_SIZE - db_len - 1);
       }
 
       int i = 2, j = strlen(db_path_), len;