Merge branch 'xdebug_3_5'

* xdebug_3_5:
  Fixed issue #2431: Crash when trying to retrieve Windows-style URL with not enough characters

Author: derickr

src/debugger/handler_dbgp.c

@@ -518,6 +518,9 @@ static xdebug_str* return_file_source(zend_string *filename, int begin, int end)
 	char  *line = NULL;
 	xdebug_str *source = xdebug_str_new();
 	char *tmp_filename = NULL;
+#ifndef WIN32
+	php_stream_statbuf ssb = {0};
+#endif
 
 	if (i < 0) {
 		begin = 0;
@@ -531,11 +534,24 @@ static xdebug_str* return_file_source(zend_string *filename, int begin, int end)
 			NULL);
 	xdfree(tmp_filename);
 
-	/* Read until the "begin" line has been read */
+	/* If we couldn't open the stream, bail out */
 	if (!stream) {
 		return NULL;
 	}
 
+#ifndef WIN32
+	/* Check what we're dealing with */
+	if (php_stream_stat(stream, &ssb) != 0) {
+		php_stream_close(stream);
+		return NULL;
+	}
+	/* If it's a directory, bail out */
+	if (S_ISDIR(ssb.sb.st_mode)) {
+		php_stream_close(stream);
+		return NULL;
+	}
+#endif
+
 	/* skip to the first requested line */
 	while (i > 0 && !php_stream_eof(stream)) {
 		if (line) {

src/lib/usefulstuff.c

@@ -271,7 +271,7 @@ char *xdebug_path_from_url(zend_string *fileurl)
 
 	if (tmp) {
 		fp = tmp + 7;
-		if (fp[0] == '/' && fp[2] == ':') {
+		if (fp[0] == '/' && fp[1] != '\0' && fp[2] == ':') {
 			fp++;
 		}
 		ret = xdstrdup(fp);

tests/debugger/bug02431.phpt

@@ -0,0 +1,40 @@
+--TEST--
+Test for bug #2431: Crash when trying to retrieve Windows-style URL with not enough characters
+--SKIPIF--
+<?php
+require __DIR__ . '/../utils.inc';
+check_reqs('dbgp');
+?>
+--FILE--
+<?php
+require 'dbgp/dbgpclient.php';
+$filename = dirname(__FILE__) . '/bug00622.inc';
+
+$commands = array(
+	'step_into',
+	"source -f file:///",
+	'step_into',
+	'detach'
+);
+
+dbgpRunFile( $filename, $commands );
+?>
+--EXPECTF--
+<?xml version="1.0" encoding="iso-8859-1"?>
+<init xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" fileuri="file://bug00622.inc" language="PHP" xdebug:language_version="" protocol_version="1.0" appid=""><engine version=""><![CDATA[Xdebug]]></engine><author><![CDATA[Derick Rethans]]></author><url><![CDATA[https://xdebug.org]]></url><copyright><![CDATA[Copyright (c) 2002-2099 by Derick Rethans]]></copyright></init>
+
+-> step_into -i 1
+<?xml version="1.0" encoding="iso-8859-1"?>
+<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="1" status="break" reason="ok"><xdebug:message filename="file://bug00622.inc" lineno="2"></xdebug:message></response>
+
+-> source -i 2 -f file:///
+<?xml version="1.0" encoding="iso-8859-1"?>
+<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="source" transaction_id="2" status="break" reason="ok"><error code="100"><message><![CDATA[can not open file]]></message></error></response>
+
+-> step_into -i 3
+<?xml version="1.0" encoding="iso-8859-1"?>
+<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="step_into" transaction_id="3" status="break" reason="ok"><xdebug:message filename="file://bug00622.inc" lineno="8"></xdebug:message></response>
+
+-> detach -i 4
+<?xml version="1.0" encoding="iso-8859-1"?>
+<response xmlns="urn:debugger_protocol_v1" xmlns:xdebug="https://xdebug.org/dbgp/xdebug" command="detach" transaction_id="4" status="stopping" reason="ok"></response>