mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-02-26 19:34:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Stop lack of history entries from writing to invalid pointers (fix 1479657)

Browse Source 
svn path=/trunk/netsurf/; revision=2708
This commit is contained in:
Richard Wilson 2006-07-04 14:07:07 +00:00
parent 5e2567370d
commit e68f20d1c0
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
desktop/history_core.c
View File

@ -87,15 +87,13 @@ struct history *history_create(void)
{
struct history *history;
history = malloc(sizeof *history);
history = calloc(1, sizeof *history);
if (!history) {
warn_user("NoMemory", 0);
return 0;
}
history->start = 0;
history->current = 0;
history->width = RIGHT_MARGIN / 2;
history->height = BOTTOM_MARGIN / 2;
return history;
}
@ -440,8 +438,12 @@ void history_layout(struct history *history)
bool shuffle = tp->tm_mon == 3 && tp->tm_mday == 1;
history->width = 0;
history->height = history_layout_subtree(history, history->start,
RIGHT_MARGIN / 2, BOTTOM_MARGIN / 2, shuffle);
if (history->start)
history->height = history_layout_subtree(history,
history->start, RIGHT_MARGIN / 2, BOTTOM_MARGIN / 2,
shuffle);
else
history->height = 0;
if (shuffle) {
history->width = 600 + WIDTH;
history->height = 400 + HEIGHT;
@ -470,7 +472,7 @@ int history_layout_subtree(struct history *history,
if (history->width < x + WIDTH)
history->width = x + WIDTH;
if (!entry->forward) {
entry->x = x;
entry->y = y;