Attachment 316703 Details for Bug 432767 – new updated version of the patch

[patch] new updated version of the patch

tuxtype2-segfault.patch (text/plain), 1.38 KB, created by Neil Horman on 2008-09-15 01:07:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neil Horman

Created: 2008-09-15 01:07:33 UTC

Size: 1.38 KB

patch

obsolete

>diff -up tuxtype2-1.5.3/tuxtype/alphabet.c.orig tuxtype2-1.5.3/tuxtype/alphabet.c
>--- tuxtype2-1.5.3/tuxtype/alphabet.c.orig	2008-09-13 15:17:56.000000000 -0400
>+++ tuxtype2-1.5.3/tuxtype/alphabet.c	2008-09-13 15:32:36.000000000 -0400
>@@ -114,12 +114,21 @@ void LoadKeyboard( void ) {
> SDL_Surface* black_outline(unsigned char *t, TTF_Font *font, SDL_Color *c) {
> 	SDL_Surface *out, *tmp;
> 	SDL_Rect dstrect;
>+	int i;
>+	/* Don't try to render non-printable chars */
>+	for (i=0;i<strlen(t);i++) {
>+		if ((t[i] < 0x20) || (t[i] > 0x7e))
>+			return NULL;
>+	}
> 
> 	/* --- create the blocky black "outline" of the text --- */
>         
>         DEBUGCODE { fprintf( stderr, "black_outline of \"%s\"\n", t ); }
> 
> 	tmp = TTF_RenderText_Solid(font, t, black);
>+	if (tmp == NULL)
>+		return NULL;
>+
> 	out = SDL_CreateRGBSurface(SDL_SWSURFACE, (tmp->w)+5, (tmp->h)+5, 32, rmask, gmask, bmask, amask);
> 
> 	dstrect.w = tmp->w;
>diff -up tuxtype2-1.5.3/tuxtype/playgame.c.orig tuxtype2-1.5.3/tuxtype/playgame.c
>--- tuxtype2-1.5.3/tuxtype/playgame.c.orig	2004-03-25 18:36:32.000000000 -0500
>+++ tuxtype2-1.5.3/tuxtype/playgame.c	2008-09-13 15:14:15.000000000 -0400
>@@ -993,6 +993,9 @@ SDL_Surface *ttf_letter(unsigned char ch
> 
>     let[0] = ch;
>     temp = TTF_RenderText_Solid(font, let, black);
>+    if (temp == NULL)
>+	return NULL;
>+
>     dstrect.w = temp->w;
>     dstrect.h = temp->h;
>     dstrect.x = 17 - (temp->w) / 2;

Actions: View | Diff

Attachments on bug 432767: 294899 | 306213 | 316670 | 316703