From: Takeshi Abe <tabe@php.net>
Date: Fri, 15 Jan 2010 17:09:14 +0000 (+0000)
Subject: fix wrong type and useless assignments
X-Git-Tag: php-5.4.0alpha1~191^2~2081
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5cb21a4ad125454565509db71a7ddedd7e34e299;p=php

fix wrong type and useless assignments
---

diff --git a/ext/gd/gd.c b/ext/gd/gd.c
index ef9e3cdd0f..0b3dab4f8b 100644
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@@ -3588,7 +3588,7 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
 	long col = -1, x = -1, y = -1;
 	int str_len, fontname_len, i, brect[8];
 	double ptsize, angle;
-	unsigned char *str = NULL, *fontname = NULL;
+	char *str = NULL, *fontname = NULL;
 	char *error = NULL;
 	int argc = ZEND_NUM_ARGS();
 #if HAVE_GD_STRINGFTEX
@@ -3657,14 +3657,10 @@ static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int
 	{
 		char tmp_font_path[MAXPATHLEN];
 
-		if (VCWD_REALPATH(fontname, tmp_font_path)) {
-			fontname = (unsigned char *) fontname;
-		} else {
+		if (!VCWD_REALPATH(fontname, tmp_font_path)) {
 			fontname = NULL;
 		}
 	}
-#else
-	fontname = (unsigned char *) fontname;
 #endif
 
 	PHP_GD_CHECK_OPEN_BASEDIR(fontname, "Invalid font filename");