Merge pull request #5335 from Dikay900:ports_to_master

2015-09-18 11:06:07 +00:00
parent 9533982729 5eb67cc2cb
commit af0942c78f
14 changed files with 100 additions and 52 deletions
--- a/modules/core/src/datastructs.cpp
+++ b/modules/core/src/datastructs.cpp
@@ -352,6 +352,7 @@ CV_IMPL CvString
 cvMemStorageAllocString( CvMemStorage* storage, const char* ptr, int len )
 {
    CvString str;
+    memset(&str, 0, sizeof(CvString));

    str.len = len >= 0 ? len : (int)strlen(ptr);
    str.ptr = (char*)cvMemStorageAlloc( storage, str.len + 1 );