Skip to content

Commit

Permalink
Fix one more memory corruption in line_edit_control.
Browse files Browse the repository at this point in the history
  • Loading branch information
intorr committed Jan 28, 2018
1 parent c099b90 commit e62cd89
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/xrEngine/line_edit_control.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -646,14 +646,14 @@ void line_edit_control::delete_selected(bool back)
{
u8 dp = ((m_p1 == m_p2) && m_p1 > 0) ? 1 : 0;
strncpy_s(m_undo_buf, m_buffer_size, m_edit_str + m_p1 - dp, m_p2 - m_p1 + dp);
strncpy_s(m_edit_str + m_p1 - dp, m_buffer_size, m_edit_str + m_p2, edit_len - m_p2);
strncpy_s(m_edit_str + m_p1 - dp, m_buffer_size - (m_p1 - dp), m_edit_str + m_p2, edit_len - m_p2);
m_cur_pos = m_p1 - dp;
}
else
{
u8 dn = ((m_p1 == m_p2) && m_p2 < edit_len) ? 1 : 0;
strncpy_s(m_undo_buf, m_buffer_size, m_edit_str + m_p1, m_p2 - m_p1 + dn);
strncpy_s(m_edit_str + m_p1, m_buffer_size, m_edit_str + m_p2 + dn, edit_len - m_p2 - dn);
strncpy_s(m_edit_str + m_p1, m_buffer_size - m_p1, m_edit_str + m_p2 + dn, edit_len - m_p2 - dn);
m_cur_pos = m_p1;
}
clamp_cur_pos();
Expand Down

0 comments on commit e62cd89

Please sign in to comment.