]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of github.com:krakjoe/phpdbg
authorFelipe Pena <felipensp@gmail.com>
Mon, 18 Nov 2013 22:08:31 +0000 (20:08 -0200)
committerFelipe Pena <felipensp@gmail.com>
Mon, 18 Nov 2013 22:08:31 +0000 (20:08 -0200)
1  2 
phpdbg_cmd.c

diff --cc phpdbg_cmd.c
index cf07d6073dd756fd01f8cf1747e9e7e7597ea911,a166fc7fb0c3edd6626c4a3a114bf2fe97717de2..ca99148664712710669391841fa5c5de6c891b76
@@@ -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);