From owner-freebsd-bugs@FreeBSD.ORG Thu Jul 14 01:20:12 2005 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 893AA16A41F for ; Thu, 14 Jul 2005 01:20:12 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C324743D53 for ; Thu, 14 Jul 2005 01:20:11 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j6E1KBab052334 for ; Thu, 14 Jul 2005 01:20:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j6E1KBU5052331; Thu, 14 Jul 2005 01:20:11 GMT (envelope-from gnats) Resent-Date: Thu, 14 Jul 2005 01:20:11 GMT Resent-Message-Id: <200507140120.j6E1KBU5052331@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dan Lukes Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 786D216A41C for ; Thu, 14 Jul 2005 01:16:05 +0000 (GMT) (envelope-from dan@kulesh.obluda.cz) Received: from kulesh.obluda.cz (kulesh.obluda.cz [193.179.22.243]) by mx1.FreeBSD.org (Postfix) with ESMTP id 51C9643D46 for ; Thu, 14 Jul 2005 01:16:03 +0000 (GMT) (envelope-from dan@kulesh.obluda.cz) Received: from kulesh.obluda.cz (localhost.eunet.cz [127.0.0.1]) by kulesh.obluda.cz (8.13.3/8.13.3) with ESMTP id j6E1G2CG028508 for ; Thu, 14 Jul 2005 03:16:02 +0200 (CEST) (envelope-from dan@kulesh.obluda.cz) Received: (from root@localhost) by kulesh.obluda.cz (8.13.3/8.13.1/Submit) id j6E1G1Gb028507; Thu, 14 Jul 2005 03:16:01 +0200 (CEST) (envelope-from dan) Message-Id: <200507140116.j6E1G1Gb028507@kulesh.obluda.cz> Date: Thu, 14 Jul 2005 03:16:01 +0200 (CEST) From: Dan Lukes To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: bin/83426: [ PATCH ] improper handling of malloc failures within libvgl X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dan Lukes List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2005 01:20:12 -0000 >Number: 83426 >Category: bin >Synopsis: [ PATCH ] improper handling of malloc failures within libvgl >Confidential: no >Severity: serious >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Jul 14 01:20:11 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Dan Lukes >Release: FreeBSD 5.4-STABLE i386 >Organization: Obludarium >Environment: System: FreeBSD 5.4-STABLE #8: Sat Jul 9 16:31:08 CEST 2005 i386 lib/libvgl/text.c,v 1.8 2002/06/02 20:05:39 schweikh >Description: 1. The failure of malloc() within VGLTextSetFontFile isn't handled properly. 2. When counting pos from 0 to strlen() then pos should be size_t - it's more portable. >How-To-Repeat: >Fix: --- patch begins here --- --- lib/libvgl/Makefile.ORIG Sun Sep 29 03:09:39 2002 +++ lib/libvgl/Makefile Thu Jul 14 03:07:08 2005 @@ -38,4 +38,6 @@ vgl.3 VGLSetXY.3 \ vgl.3 VGLTextSetFontFile.3 +WARNS+= 2 + .include --- lib/libvgl/text.c.ORIG Mon Jul 1 22:54:29 2002 +++ lib/libvgl/text.c Thu Jul 14 03:06:52 2005 @@ -63,6 +63,12 @@ fread(&VGLTextFont->Height, 1 , 1, fd); VGLTextFont->BitmapArray = (byte*)malloc(256*((VGLTextFont->Width + 7)/8)*VGLTextFont->Height); + if (VGLTextFont->BitmapArray == NULL) { + free(VGLTextFont); + VGLTextFont = NULL; + fclose(fd); + return(1); + } fread(VGLTextFont->BitmapArray, 1, (256*VGLTextFont->Width* VGLTextFont->Height), fd); fclose(fd); @@ -122,7 +128,7 @@ VGLBitmapString(VGLBitmap *Object, int x, int y, char *str, byte fgcol, byte bgcol, int fill, int dir) { - int pos; + size_t pos; for (pos=0; posRelease-Note: >Audit-Trail: >Unformatted: