Attachment 628479 Details for Bug 866989 – last diff, with checkin comment

[patch] last diff, with checkin comment

x (text/plain), 1.52 KB, created by Thomas E. Dickey on 2012-10-17 00:57:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas E. Dickey

Created: 2012-10-17 00:57:27 UTC

Size: 1.52 KB

patch

obsolete

>REV:1.50                hardscroll.c        2012/09/01 23:24:49       tom
>tags:            v5_9_20121013, v5_9_20121006, v5_9_20120929, v5_9_20120922,
>                 v5_9_20120908, v5_9_20120902, v5_9_20120901
>
>   sp->_oldnum_list would not be allocated if the sizes matched.
>   fix by also testing if sp->_oldnum_list is null
>
>--- hardscroll.c	2012/02/22 22:40:24	1.49
>+++ hardscroll.c	2012/09/01 23:24:49	1.50
>@@ -147,7 +147,7 @@
> 
> #include <curses.priv.h>
> 
>-MODULE_ID("$Id: hardscroll.c,v 1.48 2012/02/19 22:18:33 tom Exp $")
>+MODULE_ID("$Id: hardscroll.c,v 1.49 2012/02/22 22:40:24 tom Exp $")
> 
> #if defined(SCROLLDEBUG) || defined(HASHDEBUG)
> 
>@@ -193,14 +193,21 @@
> #if !defined(SCROLLDEBUG) && !defined(HASHDEBUG)
> #if USE_HASHMAP
>     /* get enough storage */
>-    if (OLDNUM_SIZE(SP_PARM) < screen_lines(SP_PARM)) {
>+    assert(OLDNUM_SIZE(SP_PARM) >= 0);
>+    assert(screen_lines(SP_PARM) > 0);
>+    if ((oldnums(SP_PARM) == 0)
>+	|| (OLDNUM_SIZE(SP_PARM) < screen_lines(SP_PARM))) {
>+	int need_lines = ((OLDNUM_SIZE(SP_PARM) < screen_lines(SP_PARM))
>+			  ? screen_lines(SP_PARM)
>+			  : OLDNUM_SIZE(SP_PARM));
> 	int *new_oldnums = typeRealloc(int,
>-				       (size_t) screen_lines(SP_PARM),
>+				       (size_t) need_lines,
> 				       oldnums(SP_PARM));
> 	if (!new_oldnums)
> 	    return;
>+	FreeIfNeeded(oldnums(SP_PARM));
> 	oldnums(SP_PARM) = new_oldnums;
>-	OLDNUM_SIZE(SP_PARM) = screen_lines(SP_PARM);
>+	OLDNUM_SIZE(SP_PARM) = need_lines;
>     }
>     /* calculate the indices */
>     NCURSES_SP_NAME(_nc_hash_map) (NCURSES_SP_ARG);

Actions: View | Diff

Attachments on bug 866989: 628163 | 628164 | 628165 | 628166 | 628167 | 628168 | 628169 | 628170 | 628171 | 628172 | 628173 | 628479