diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-10 08:55:36 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-10 08:55:36 +0100 |
| commit | a0124a5e8e70979d2c24ef55285da989fdad766a (patch) | |
| tree | 5cea5c9804a8edf67bc7260e0851a20d21324547 /fontconfig/src/fcstr.c | |
| parent | 514b4afb64ccbf8e954270105ed5064272a2be68 (diff) | |
| parent | 0328076efb5ff6e62152c09e38d0d11f7931d07b (diff) | |
| download | vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.tar.gz vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.tar.bz2 vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesa pixman git update 10 dec 2012
Conflicts:
fontconfig/src/fcxml.c
Diffstat (limited to 'fontconfig/src/fcstr.c')
| -rw-r--r-- | fontconfig/src/fcstr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fontconfig/src/fcstr.c b/fontconfig/src/fcstr.c index 037960d2f..99b59da0a 100644 --- a/fontconfig/src/fcstr.c +++ b/fontconfig/src/fcstr.c @@ -38,7 +38,6 @@ FcStrCopy (const FcChar8 *s) { int len; FcChar8 *r; - if (!s) return 0; len = strlen ((char *) s) + 1; @@ -1204,7 +1203,7 @@ FcStrSetAddLangs (FcStrSet *strs, const char *languages) if (normalized_lang) { FcStrSetAdd (strs, normalized_lang); - free (normalized_lang); + FcStrFree (normalized_lang); ret = FcTrue; } } @@ -1216,7 +1215,7 @@ FcStrSetAddLangs (FcStrSet *strs, const char *languages) if (normalized_lang) { FcStrSetAdd (strs, normalized_lang); - free (normalized_lang); + FcStrFree (normalized_lang); ret = FcTrue; } } |