git-svn-id: svn://db.shs.com.ru/pip@778 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

2019-04-16 13:48:13 +00:00
parent c6376002ed
commit 10b70f5acf
8 changed files with 88 additions and 30 deletions
--- a/src_main/core/pistring.cpp
+++ b/src_main/core/pistring.cpp
@@ -438,6 +438,7 @@ PIByteArray PIString::toCharset(const char * c) const {


 PIString & PIString::operator +=(const char * str) {
+	if (!str) return *this;
 	int l = 0;
 	while (str[l] != '\0') ++l;
 	appendFromChars(str, l);
@@ -446,6 +447,7 @@ PIString & PIString::operator +=(const char * str) {


 PIString & PIString::operator +=(const wchar_t * str) {
+	if (!str) return *this;
 	//cout << "wc" << endl;
 	/*int l = 0, sz;
 	char * c = new char[MB_CUR_MAX];