diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-05 23:54:59 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-05 23:54:59 +0400 |
| commit | 63ad25c30ddca609d39e3ae6288cdddeed7fb918 (patch) | |
| tree | 14c7f3423ab41c22a2901dd3170990f322e5d9f9 /intern/cycles/util | |
| parent | c40d8921b8b61c0465a2fe9bca72dc418bf39c7d (diff) | |
Cycles:
Fix #29475: remove node from properties editor crash on windows. This was a bug
in the UI code, which code access removed data.
Fix OpenCL still being used in a case where Experimental was disabled.
Fix msvc debug warning in md5 code.
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_md5.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/util/util_md5.cpp b/intern/cycles/util/util_md5.cpp index b871fad3636..25a77f18d02 100644 --- a/intern/cycles/util/util_md5.cpp +++ b/intern/cycles/util/util_md5.cpp @@ -361,14 +361,15 @@ void MD5Hash::finish(uint8_t digest[16]) string MD5Hash::get_hex() { uint8_t digest[16]; - char buf[16*2]; + char buf[16*2+1]; finish(digest); for(int i=0; i<16; i++) sprintf(buf + i*2, "%02X", digest[i]); + buf[sizeof(buf)-1] = '\0'; - return string(buf, sizeof(buf)); + return string(buf); } CCL_NAMESPACE_END |