From ca85fc5c8a23bde409812fc137887fd1d09ec75f Mon Sep 17 00:00:00 2001 From: Alexander Ewering Date: Mon, 31 Oct 2005 16:46:22 +0000 Subject: Found a potential crash where NULL could be passed to vfont_get_data(), here's the fix. Maybe it fixes Andy's file :) --- source/blender/blenkernel/intern/font.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/blender/blenkernel') diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index fc8a3df9e6f..1b04a43ae28 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -409,11 +409,11 @@ static VFont *which_vfont(Curve *cu, CharInfo *info) { switch(info->flag & CU_STYLE) { case CU_BOLD: - return(cu->vfontb); + if (cu->vfontb) return(cu->vfontb); else return(cu->vfont); case CU_ITALIC: - return(cu->vfonti); + if (cu->vfonti) return(cu->vfonti); else return(cu->vfont); case (CU_BOLD|CU_ITALIC): - return(cu->vfontbi); + if (cu->vfontbi) return(cu->vfontbi); else return(cu->vfont); default: return(cu->vfont); } -- cgit v1.2.3