Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make sure that MaxBeginning in Scrollpad::Refresh() is never negative

Browse Source 
this sometimes triggered segfault in pdcurses
while switching to screens, that use scrollpads.
This commit is contained in:
Andrzej Rybczak
2009-10-25 03:49:02 +01:00
parent e112e0d975
commit 08f4459b54
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/scrollpad.cpp
View File

@@ -18,6 +18,8 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/ ***************************************************************************/
#include <cassert>
#include "scrollpad.h" #include "scrollpad.h"
using namespace NCurses; using namespace NCurses;
@@ -83,7 +85,8 @@ void Scrollpad::Flush()
space_pos = 0; space_pos = 0;
} }
} }
Recreate(itsWidth, std::max(itsHeight, itsRealHeight)); itsRealHeight = std::max(itsHeight, itsRealHeight);
Recreate(itsWidth, itsRealHeight);
itsBuffer.SetTemp(&s); itsBuffer.SetTemp(&s);
static_cast<Window &>(*this) << itsBuffer; static_cast<Window &>(*this) << itsBuffer;
itsBuffer.SetTemp(0); itsBuffer.SetTemp(0);
@@ -121,6 +124,7 @@ void Scrollpad::RemoveFormatting()
void Scrollpad::Refresh() void Scrollpad::Refresh()
{ {
int MaxBeginning = itsRealHeight-itsHeight; int MaxBeginning = itsRealHeight-itsHeight;
assert(MaxBeginning >= 0);
if (itsBeginning > MaxBeginning) if (itsBeginning > MaxBeginning)
itsBeginning = MaxBeginning; itsBeginning = MaxBeginning;
prefresh(itsWindow, itsBeginning, 0, itsStartY, itsStartX, itsStartY+itsHeight-1, itsStartX+itsWidth-1); prefresh(itsWindow, itsBeginning, 0, itsStartY, itsStartX, itsStartY+itsHeight-1, itsStartX+itsWidth-1);
@@ -129,7 +133,6 @@ void Scrollpad::Refresh()
void Scrollpad::Resize(size_t new_width, size_t new_height) void Scrollpad::Resize(size_t new_width, size_t new_height)
{ {
AdjustDimensions(new_width, new_height); AdjustDimensions(new_width, new_height);
itsRealHeight = itsHeight;
Flush(); Flush();
} }