From: Pierre Joye <pajoye@php.net>
Date: Mon, 10 Jan 2011 08:07:38 +0000 (+0000)
Subject: - possible NULL deref
X-Git-Tag: php-5.4.0alpha1~191^2~393
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f25ab1bf9c46e0c65399de3fbcae47f3af1ac0b4;p=php

- possible NULL deref
---

diff --git a/win32/readdir.c b/win32/readdir.c
index 52ebe2fd09..9525fc0d6b 100644
--- a/win32/readdir.c
+++ b/win32/readdir.c
@@ -33,6 +33,9 @@ DIR *opendir(const char *dir)
 	}
 
 	filespec = (char *)malloc(strlen(resolved_path_buff) + 2 + 1);
+	if (filespec == NULL) {
+		return NULL;
+	}
 	strcpy(filespec, resolved_path_buff);
 	index = strlen(filespec) - 1;
 	if (index >= 0 && (filespec[index] == '/' || 
@@ -41,6 +44,9 @@ DIR *opendir(const char *dir)
 	strcat(filespec, "\\*");
 
 	dp = (DIR *) malloc(sizeof(DIR));
+	if (dp == NULL) {
+		return NULL;
+	}
 	dp->offset = 0;
 	dp->finished = 0;
 
@@ -140,6 +146,10 @@ int rewinddir(DIR *dp)
 	dp->finished = 0;
 
 	filespec = (char *)malloc(strlen(dp->dir) + 2 + 1);
+	if (filespec == NULL) {
+		return -1;
+	}
+
 	strcpy(filespec, dp->dir);
 	index = strlen(filespec) - 1;
 	if (index >= 0 && (filespec[index] == '/' ||