Reorder

laruence · laruence · commit 4eb830b212b3 · 2015-02-27T12:02:42.000+08:00
diff --git a/main/main.c b/main/main.c
@@ -1246,12 +1246,11 @@ PHPAPI char *php_get_current_user(TSRMLS_D)
 			efree(pwbuf);
 			return "";
 		}
-		pwd = &_pw;
-
 		if (retpwptr == NULL) {
 			efree(pwbuf);
 			return "";
 		}
+		pwd = &_pw;
 #else
 		if ((pwd=getpwuid(pstat->st_uid))==NULL) {
 			return "";

Original file line number	Diff line number	Diff line change
`@@ -1246,12 +1246,11 @@ PHPAPI char *php_get_current_user(TSRMLS_D)`
`1246`	`1246`	`efree(pwbuf);`
`1247`	`1247`	`return "";`
`1248`	`1248`	`}`
`1249`		`- pwd = &_pw;`
`1250`		`-`
`1251`	`1249`	`if (retpwptr == NULL) {`
`1252`	`1250`	`efree(pwbuf);`
`1253`	`1251`	`return "";`
`1254`	`1252`	`}`
	`1253`	`+ pwd = &_pw;`
`1255`	`1254`	`#else`
`1256`	`1255`	`if ((pwd=getpwuid(pstat->st_uid))==NULL) {`
`1257`	`1256`	`return "";`