fixed crash in test_core

94e09f24 · Vadim Pisarevsky · 9a991a2e · 94e09f24
Commit 94e09f24 authored Apr 18, 2011 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

system.cpp modules/core/src/system.cpp +3 -2

No files found.
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@ -363,9 +363,10 @@ string tempfile( const char* suffix )
 #endif
    if (*name == '\\')
        ++name;
+    string n(name);
    if (suffix != 0)
-        return string(buf) + suffix;
-    return buf;
+        n += (n[n.size()-1] == '.' && suffix[0] == '.' ? suffix + 1 : suffix);
+    return n;
 }

 static CvErrorCallback customErrorCallback = 0;