From: Bob Weinand <bobwei9@hotmail.com>
Date: Tue, 23 Sep 2014 16:29:36 +0000 (+0200)
Subject: Fix accidental short-circuiting when comparing fds (& warnings)
X-Git-Tag: php-5.6.3RC1~51^2~52^2~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b81337f80419b1736224461edc2266852a37fcc;p=php

Fix accidental short-circuiting when comparing fds (& warnings)
---

diff --git a/phpdbg.c b/phpdbg.c
index ab2f8256ee..0c4e2f11bf 100644
--- a/phpdbg.c
+++ b/phpdbg.c
@@ -534,7 +534,7 @@ static size_t phpdbg_stdiop_write(php_stream *stream, const char *buf, size_t co
 	while (data->fd >= 0) {
 		struct stat stat[3];
 		memset(stat, 0, sizeof(stat));
-		if ((fstat(fileno(stderr), &stat[2]) < 0 && fstat(fileno(stdout), &stat[0]) < 0) || fstat(data->fd, &stat[1]) < 0) {
+		if (((fstat(fileno(stderr), &stat[2]) < 0) & (fstat(fileno(stdout), &stat[0]) < 0)) | (fstat(data->fd, &stat[1]) < 0)) {
 			break;
 		}
 
diff --git a/phpdbg_set.c b/phpdbg_set.c
index e5d8d6d1db..da85071941 100644
--- a/phpdbg_set.c
+++ b/phpdbg_set.c
@@ -69,9 +69,9 @@ PHPDBG_SET(break) /* {{{ */
 			} else {
 				phpdbg_breakbase_t *brake = phpdbg_find_breakbase(param->num TSRMLS_CC);
 				if (brake) {
-					phpdbg_writeln("setbreak", "id=\"%d\" active=\"%s\"", "Breakpoint #%d %s", param->num, brake->disabled ? "off" : "on");
+					phpdbg_writeln("setbreak", "id=\"%ld\" active=\"%s\"", "Breakpoint #%ld %s", param->num, brake->disabled ? "off" : "on");
 				} else {
-					phpdbg_error("setbreak", "type=\"nobreak\" id=\"%d\"", "Failed to find breakpoint #%ld", param->num);
+					phpdbg_error("setbreak", "type=\"nobreak\" id=\"%ld\"", "Failed to find breakpoint #%ld", param->num);
 				}
 			}
 		} break;