retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Escape \r and \n too. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@2533 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2009-03-22 21:54:13 +00:00
parent 55ade880dc
commit 29a9368277
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
engine/DataBlock.cpp
View File

@ -338,16 +338,27 @@ String DataBlock::sqlEscape(char extraEsc) const
unsigned int i; unsigned int i;
for (i = 0; i < m_length; i++) { for (i = 0; i < m_length; i++) {
char c = static_cast<char*>(m_data)[i]; char c = static_cast<char*>(m_data)[i];
if (c == '\0' || c == '\\' || c == '\'' || c == extraEsc) if (c == '\0' || c == '\r' || c == '\n' || c == '\\' || c == '\'' || c == extraEsc)
len++; len++;
} }
String tmp(' ',len); String tmp(' ',len);
char* d = const_cast<char*>(tmp.c_str()); char* d = const_cast<char*>(tmp.c_str());
for (i = 0; i < m_length; i++) { for (i = 0; i < m_length; i++) {
char c = static_cast<char*>(m_data)[i]; char c = static_cast<char*>(m_data)[i];
if (c == '\0' || c == '\\' || c == '\'' || c == extraEsc) if (c == '\0' || c == '\r' || c == '\n' || c == '\\' || c == '\'' || c == extraEsc)
*d++ = '\\'; *d++ = '\\';
*d++ = c ? c : '0'; switch (c) {
case '\0':
c = '0';
break;
case '\r':
c = 'r';
break;
case '\n':
c = 'n';
break;
}
*d++ = c;
} }
return tmp; return tmp;
} }