]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Fix buffer overrun in font loading.
authordivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 5 Mar 2015 10:48:27 +0000 (10:48 +0000)
committerdivverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Thu, 5 Mar 2015 10:48:27 +0000 (10:48 +0000)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12192 d7cf8633-e32d-0410-b094-e92efae38249

ft2.c

diff --git a/ft2.c b/ft2.c
index 80401bc2abdfb6b28ede16456bcdce36dd86422e..bc9544f2153f6f345083ce2ea35f47d000e714e0 100644 (file)
--- a/ft2.c
+++ b/ft2.c
@@ -703,7 +703,7 @@ static qboolean Font_LoadFile(const char *name, int _face, ft2_settings_t *setti
                        Con_Printf("Failed to add attachment %u to %s\n", (unsigned)i, font->name);
        }
 
-       memcpy(font->name, name, namelen+1);
+       strlcpy(font->name, name, sizeof(font->name));
        font->image_font = false;
        font->has_kerning = !!(((FT_Face)(font->face))->face_flags & FT_FACE_FLAG_KERNING);
        return true;