diff options
| author | marha <marha@users.sourceforge.net> | 2013-01-28 07:58:44 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-01-28 07:58:44 +0100 |
| commit | 39b49babc915183f4d712053b46f0e010427c191 (patch) | |
| tree | b512cf3f17a0defe9e2cd6ababdc9f5337f93d0e /mkfontscale/mkfontscale.c | |
| parent | 3e3af07f7697e9d23dd62fcf8f3a055602ae3341 (diff) | |
| parent | 69c8cec54b01ed522bf10baf20da70304bac701a (diff) | |
| download | vcxsrv-39b49babc915183f4d712053b46f0e010427c191.tar.gz vcxsrv-39b49babc915183f4d712053b46f0e010427c191.tar.bz2 vcxsrv-39b49babc915183f4d712053b46f0e010427c191.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa mkfontscale pixman git update 28 jan 2013
Diffstat (limited to 'mkfontscale/mkfontscale.c')
| -rw-r--r-- | mkfontscale/mkfontscale.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mkfontscale/mkfontscale.c b/mkfontscale/mkfontscale.c index 01e982bf0..e605cf9bd 100644 --- a/mkfontscale/mkfontscale.c +++ b/mkfontscale/mkfontscale.c @@ -20,6 +20,8 @@ THE SOFTWARE. */ +#include "config.h" + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -898,10 +900,9 @@ doDirectory(const char *dirname_given, int numEncodings, ListPtr encodingsToDo) BDF_PropertyRec prop; rc = FT_Get_BDF_Property(face, "FONT", &prop); if(rc == 0 && prop.type == BDF_PROPERTY_TYPE_ATOM) { - xlfd_name = malloc(strlen(prop.u.atom) + 1); + xlfd_name = strdup(prop.u.atom); if(xlfd_name == NULL) goto done; - strcpy(xlfd_name, prop.u.atom); } } } |