From: Felipe Pena <felipe@php.net>
Date: Sat, 19 Nov 2011 18:50:49 +0000 (+0000)
Subject: - Fixed bug #60339 (valgrind reports LEAK --with-mm)
X-Git-Tag: php-5.5.0alpha1~856
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=276518ff174a8d8a416cef8ada75dd803ae6591c;p=php

- Fixed bug #60339 (valgrind reports LEAK --with-mm)
  patch by: yohgaki at ohgaki dot net
---

diff --git a/ext/session/mod_mm.c b/ext/session/mod_mm.c
index 704164aa4a..47e3418c86 100644
--- a/ext/session/mod_mm.c
+++ b/ext/session/mod_mm.c
@@ -278,7 +278,7 @@ PHP_MINIT_FUNCTION(ps_mm)
 	ps_mm_path = emalloc(save_path_len + 1 + (sizeof(PS_MM_FILE) - 1) + mod_name_len + euid_len + 1);
 
 	memcpy(ps_mm_path, PS(save_path), save_path_len);
-	if (PS(save_path)[save_path_len - 1] != DEFAULT_SLASH) {
+	if (save_path_len && PS(save_path)[save_path_len - 1] != DEFAULT_SLASH) {
 		ps_mm_path[save_path_len] = DEFAULT_SLASH;
 		save_path_len++;
 	}