Skip to content

Commit 390b25f

Browse files
committed
mapi_lib: proper error code for g_str() running over misformatted input buffer
1 parent 5f2c7f5 commit 390b25f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/mapi/ext_buffer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ pack_result EXT_PULL::g_str(char **ppstr)
177177
return pack_result::bufsize;
178178
auto len = strnlen(&m_cdata[m_offset], m_data_size - m_offset);
179179
if (len + 1 > m_data_size - m_offset)
180-
return pack_result::bufsize;
180+
return pack_result::format;
181181
len ++;
182182
*ppstr = anew<char>(len);
183183
if (*ppstr == nullptr)
@@ -192,7 +192,7 @@ pack_result EXT_PULL::g_str(std::string *out) try
192192
return pack_result::bufsize;
193193
auto len = strnlen(&m_cdata[m_offset], m_data_size - m_offset);
194194
if (len + 1 > m_data_size - m_offset)
195-
return pack_result::bufsize;
195+
return pack_result::format;
196196
out->resize(len);
197197
/* Copy with, and advance over, NUL */
198198
memcpy(out->data(), &m_udata[m_offset], len + 1);

0 commit comments

Comments
 (0)