--- embedaddon/php/main/fopen_wrappers.c	2013/07/22 01:32:11	1.1.1.3
+++ embedaddon/php/main/fopen_wrappers.c	2014/06/15 20:04:01	1.1.1.4
@@ -2,7 +2,7 @@
    +----------------------------------------------------------------------+
    | PHP Version 5                                                        |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2013 The PHP Group                                |
+   | Copyright (c) 1997-2014 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 3.01 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: fopen_wrappers.c,v 1.1.1.3 2013/07/22 01:32:11 misho Exp $ */
+/* $Id: fopen_wrappers.c,v 1.1.1.4 2014/06/15 20:04:01 misho Exp $ */
 
 /* {{{ includes
  */
@@ -775,7 +775,12 @@ PHPAPI char *expand_filepath_with_mode(const char *fil
 				 * we cannot cannot getcwd() and the requested,
 				 * relatively referenced file is accessible */
 				copy_len = strlen(filepath) > MAXPATHLEN - 1 ? MAXPATHLEN - 1 : strlen(filepath);
-				real_path = estrndup(filepath, copy_len);
+				if (real_path) {
+					memcpy(real_path, filepath, copy_len);
+					real_path[copy_len] = '\0';
+				} else {
+					real_path = estrndup(filepath, copy_len);
+				}
 				close(fdtest);
 				return real_path;
 			} else {