From: Felipe Pena <felipensp@gmail.com>
Date: Mon, 18 Nov 2013 22:08:31 +0000 (-0200)
Subject: Merge branch 'master' of github.com:krakjoe/phpdbg
X-Git-Tag: php-5.6.0alpha1~110^2~221^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=723c6717504018b0cbb35f66d2663b323b9d3946;p=php

Merge branch 'master' of github.com:krakjoe/phpdbg
---

723c6717504018b0cbb35f66d2663b323b9d3946
diff --cc phpdbg_cmd.c
index cf07d6073d,a166fc7fb0..ca99148664
--- a/phpdbg_cmd.c
+++ b/phpdbg_cmd.c
@@@ -99,25 -98,29 +99,28 @@@ parsed
  
  void phpdbg_clear_param(phpdbg_param_t *param TSRMLS_DC) /* {{{ */
  {
- 	switch (param->type) {
- 		case FILE_PARAM:
- 			efree(param->file.name);
- 			break;
- 		case METHOD_PARAM:
- 			efree(param->method.class);
- 			efree(param->method.name);
- 			break;
- 		case STR_PARAM:
- 			efree(param->str);
- 			break;
- 		default:
- 			break;
+ 	if (param) {
+ 		switch (param->type) {
+ 			case FILE_PARAM:
+ 				efree(param->file.name);
+ 				break;
+ 			case METHOD_PARAM:
+ 				efree(param->method.class);
+ 				efree(param->method.name);
+ 				break;
+ 			case STR_PARAM:
+ 				efree(param->str);
+ 				break;
+ 			default:
+ 				break;
+ 		}
  	}
+ 	
  } /* }}} */
  
 -int phpdbg_do_cmd(	const phpdbg_command_t *command, char *cmd_line, size_t cmd_len TSRMLS_DC) /* {{{ */
 +int phpdbg_do_cmd(const phpdbg_command_t *command, char *cmd_line, size_t cmd_len TSRMLS_DC) /* {{{ */
  {
  	int rc = FAILURE;
 -
  	char *expr = NULL;
  #ifndef _WIN32
  	const char *cmd = strtok_r(cmd_line, " ", &expr);