Merge pull request opencv#9397 from alalek:memcpy_null_guard

alalek · alalek · commit 316fb26f5bad · 2017-08-18T08:47:17.000Z
diff --git a/modules/core/include/opencv2/core/cvstd.hpp b/modules/core/include/opencv2/core/cvstd.hpp
@@ -598,6 +598,7 @@ String::String(const char* s)
 {
     if (!s) return;
     size_t len = strlen(s);
+    if (!len) return;
     memcpy(allocate(len), s, len);
 }
 
@@ -665,7 +666,7 @@ String& String::operator=(const char* s)
     deallocate();
     if (!s) return *this;
     size_t len = strlen(s);
-    memcpy(allocate(len), s, len);
+    if (len) memcpy(allocate(len), s, len);
     return *this;
 }
 
@@ -959,8 +960,8 @@ String operator + (const String& lhs, const String& rhs)
 {
     String s;
     s.allocate(lhs.len_ + rhs.len_);
-    memcpy(s.cstr_, lhs.cstr_, lhs.len_);
-    memcpy(s.cstr_ + lhs.len_, rhs.cstr_, rhs.len_);
+    if (lhs.len_) memcpy(s.cstr_, lhs.cstr_, lhs.len_);
+    if (rhs.len_) memcpy(s.cstr_ + lhs.len_, rhs.cstr_, rhs.len_);
     return s;
 }
 
@@ -970,8 +971,8 @@ String operator + (const String& lhs, const char* rhs)
     String s;
     size_t rhslen = strlen(rhs);
     s.allocate(lhs.len_ + rhslen);
-    memcpy(s.cstr_, lhs.cstr_, lhs.len_);
-    memcpy(s.cstr_ + lhs.len_, rhs, rhslen);
+    if (lhs.len_) memcpy(s.cstr_, lhs.cstr_, lhs.len_);
+    if (rhslen) memcpy(s.cstr_ + lhs.len_, rhs, rhslen);
     return s;
 }
 
@@ -981,8 +982,8 @@ String operator + (const char* lhs, const String& rhs)
     String s;
     size_t lhslen = strlen(lhs);
     s.allocate(lhslen + rhs.len_);
-    memcpy(s.cstr_, lhs, lhslen);
-    memcpy(s.cstr_ + lhslen, rhs.cstr_, rhs.len_);
+    if (lhslen) memcpy(s.cstr_, lhs, lhslen);
+    if (rhs.len_) memcpy(s.cstr_ + lhslen, rhs.cstr_, rhs.len_);
     return s;
 }
 
@@ -991,7 +992,7 @@ String operator + (const String& lhs, char rhs)
 {
     String s;
     s.allocate(lhs.len_ + 1);
-    memcpy(s.cstr_, lhs.cstr_, lhs.len_);
+    if (lhs.len_) memcpy(s.cstr_, lhs.cstr_, lhs.len_);
     s.cstr_[lhs.len_] = rhs;
     return s;
 }
@@ -1002,7 +1003,7 @@ String operator + (char lhs, const String& rhs)
     String s;
     s.allocate(rhs.len_ + 1);
     s.cstr_[0] = lhs;
-    memcpy(s.cstr_ + 1, rhs.cstr_, rhs.len_);
+    if (rhs.len_) memcpy(s.cstr_ + 1, rhs.cstr_, rhs.len_);
     return s;
 }
 
diff --git a/modules/core/include/opencv2/core/cvstd.inl.hpp b/modules/core/include/opencv2/core/cvstd.inl.hpp
@@ -80,7 +80,7 @@ String::String(const std::string& str)
     if (!str.empty())
     {
         size_t len = str.size();
-        memcpy(allocate(len), str.c_str(), len);
+        if (len) memcpy(allocate(len), str.c_str(), len);
     }
 }
 
@@ -102,7 +102,7 @@ String& String::operator = (const std::string& str)
     if (!str.empty())
     {
         size_t len = str.size();
-        memcpy(allocate(len), str.c_str(), len);
+        if (len) memcpy(allocate(len), str.c_str(), len);
     }
     return *this;
 }
@@ -126,8 +126,8 @@ String operator + (const String& lhs, const std::string& rhs)
     String s;
     size_t rhslen = rhs.size();
     s.allocate(lhs.len_ + rhslen);
-    memcpy(s.cstr_, lhs.cstr_, lhs.len_);
-    memcpy(s.cstr_ + lhs.len_, rhs.c_str(), rhslen);
+    if (lhs.len_) memcpy(s.cstr_, lhs.cstr_, lhs.len_);
+    if (rhslen) memcpy(s.cstr_ + lhs.len_, rhs.c_str(), rhslen);
     return s;
 }
 
@@ -137,8 +137,8 @@ String operator + (const std::string& lhs, const String& rhs)
     String s;
     size_t lhslen = lhs.size();
     s.allocate(lhslen + rhs.len_);
-    memcpy(s.cstr_, lhs.c_str(), lhslen);
-    memcpy(s.cstr_ + lhslen, rhs.cstr_, rhs.len_);
+    if (lhslen) memcpy(s.cstr_, lhs.c_str(), lhslen);
+    if (rhs.len_) memcpy(s.cstr_ + lhslen, rhs.cstr_, rhs.len_);
     return s;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ String::String(const std::string& str)`
`80`	`80`	`if (!str.empty())`
`81`	`81`	`{`
`82`	`82`	`size_t len = str.size();`
`83`		`- memcpy(allocate(len), str.c_str(), len);`
	`83`	`+ if (len) memcpy(allocate(len), str.c_str(), len);`
`84`	`84`	`}`
`85`	`85`	`}`
`86`	`86`
`@@ -102,7 +102,7 @@ String& String::operator = (const std::string& str)`
`102`	`102`	`if (!str.empty())`
`103`	`103`	`{`
`104`	`104`	`size_t len = str.size();`
`105`		`- memcpy(allocate(len), str.c_str(), len);`
	`105`	`+ if (len) memcpy(allocate(len), str.c_str(), len);`
`106`	`106`	`}`
`107`	`107`	`return *this;`
`108`	`108`	`}`
`@@ -126,8 +126,8 @@ String operator + (const String& lhs, const std::string& rhs)`
`126`	`126`	`String s;`
`127`	`127`	`size_t rhslen = rhs.size();`
`128`	`128`	`s.allocate(lhs.len_ + rhslen);`
`129`		`- memcpy(s.cstr_, lhs.cstr_, lhs.len_);`
`130`		`- memcpy(s.cstr_ + lhs.len_, rhs.c_str(), rhslen);`
	`129`	`+ if (lhs.len_) memcpy(s.cstr_, lhs.cstr_, lhs.len_);`
	`130`	`+ if (rhslen) memcpy(s.cstr_ + lhs.len_, rhs.c_str(), rhslen);`
`131`	`131`	`return s;`
`132`	`132`	`}`
`133`	`133`
`@@ -137,8 +137,8 @@ String operator + (const std::string& lhs, const String& rhs)`
`137`	`137`	`String s;`
`138`	`138`	`size_t lhslen = lhs.size();`
`139`	`139`	`s.allocate(lhslen + rhs.len_);`
`140`		`- memcpy(s.cstr_, lhs.c_str(), lhslen);`
`141`		`- memcpy(s.cstr_ + lhslen, rhs.cstr_, rhs.len_);`
	`140`	`+ if (lhslen) memcpy(s.cstr_, lhs.c_str(), lhslen);`
	`141`	`+ if (rhs.len_) memcpy(s.cstr_ + lhslen, rhs.cstr_, rhs.len_);`
`142`	`142`	`return s;`
`143`	`143`	`}`
`144`	`144`