i think that we can do this...as we'd just be overwriting if the last

slot is actually full
This commit is contained in:
DarthArgus
2016-10-16 07:53:23 +00:00
parent f21883785d
commit 3dc2bd7937
2 changed files with 6 additions and 8 deletions
@@ -254,12 +254,11 @@ namespace DB
if (bufsize >= S) {
WARNING(true, ("Attmpted to insert %s which is too long. Truncating.", buffer));
indicator = S;
memcpy(m_value, buffer, indicator-1);
} else {
indicator = bufsize;
memcpy(m_value, buffer, indicator);
}
memcpy(m_value, buffer, indicator);
m_value[indicator] = '\0';
}
@@ -274,10 +273,10 @@ namespace DB
memcpy(m_value, Unicode::wideToNarrow(buffer).c_str(), indicator-1);
} else {
indicator = bufsize;
memcpy(m_value, Unicode::wideToNarrow(buffer).c_str(), indicator);
}
m_value[indicator] = '\0';
memcpy(m_value, Unicode::wideToNarrow(buffer).c_str(), indicator);
m_value[indicator] = '\0';
}
template<int S>
@@ -288,12 +287,12 @@ namespace DB
if (bufsize >= S) {
WARNING(true, ("Attmpted to insert %s which is too long. Truncating.", buffer.c_str()));
indicator = S;
memcpy(m_value, buffer.c_str(), indicator-1);
} else {
indicator = bufsize;
memcpy(m_value, buffer.c_str(), indicator);
}
memcpy(m_value, buffer.c_str(), indicator);
m_value[indicator] = '\0';
}
@@ -200,12 +200,11 @@ namespace DB
if (bufsize >= S) {
WARNING(true, ("Attmpted to insert %s which is too long. Truncating.", buffer.c_str()));
indicator = S;
memcpy(m_value, str.c_str(), indicator-1);
} else {
indicator = bufsize;
memcpy(m_value, str.c_str(), indicator);
}
memcpy(m_value, str.c_str(), indicator);
m_value[indicator] = '\0';
}