iolog: fix --bandwidth-log segfaults

[fio.git] / verify-state.h

diff --git a/verify-state.h b/verify-state.h
index 2fe710f19f9f2f5aeb95c2a9e4d21c25acfd88c3..e46265e48d7a6c4ddbbac34a458e26d3272d60da 100644 (file)
--- a/verify-state.h
+++ b/verify-state.h
@@ -3,6 +3,7 @@
 
 #include <stdint.h>
 #include <string.h>
+#include <limits.h>
 
 struct thread_rand32_state {
        uint32_t s[4];
@@ -83,21 +84,25 @@ static inline void verify_state_gen_name(char *out, size_t size,
                                         const char *name, const char *prefix,
                                         int num)
 {
+       char ename[PATH_MAX];
        char *ptr;
 
-       snprintf(out, size, "%s-%s-%d-verify.state", prefix, name, num);
-       out[size - 1] = '\0';
-
        /*
         * Escape '/', just turn them into '.'
         */
-       ptr = out;
-       while ((ptr = strchr(ptr, '/')) != NULL) {
-               *ptr = '.';
-               ptr++;
+       ptr = ename;
+       do {
+               *ptr = *name;
                if (*ptr == '\0')
                        break;
-       }
+               else if (*ptr == '/')
+                       *ptr = '.';
+               ptr++;
+               name++;
+       } while (1);
+
+       snprintf(out, size, "%s-%s-%d-verify.state", prefix, ename, num);
+       out[size - 1] = '\0';
 }
 
 #endif