- Passing strlen to phpdbg_set_breakpoint_symbol

diff --git a/phpdbg_bp.c b/phpdbg_bp.c
index 849b8def0d56ecb61012ac242af8adba9b750a15..8a71125130c464f933cd10ca9a8582ecacdc1517 100644 (file)
--- a/phpdbg_bp.c
+++ b/phpdbg_bp.c
@@ -84,10 +84,8 @@ PHPDBG_API void phpdbg_set_breakpoint_file(const char *path, long line_num TSRML
     }
 } /* }}} */
 
-PHPDBG_API void phpdbg_set_breakpoint_symbol(const char *name TSRMLS_DC) /* {{{ */
+PHPDBG_API void phpdbg_set_breakpoint_symbol(const char *name, size_t name_len TSRMLS_DC) /* {{{ */
 {
-       size_t name_len = strlen(name);
-
        if (!zend_hash_exists(&PHPDBG_G(bp)[PHPDBG_BREAK_SYM], name, name_len)) {
                phpdbg_breaksymbol_t new_break;
 

diff --git a/phpdbg_bp.h b/phpdbg_bp.h
index 953d5a6d906d2b774d6316d0db9151df19e8a37a..ddc363e42fc8b31990f08934092d6c353c225d15 100644 (file)
--- a/phpdbg_bp.h
+++ b/phpdbg_bp.h
@@ -78,7 +78,7 @@ typedef struct _phpdbg_breakcond_t {
 } phpdbg_breakcond_t;
 
 PHPDBG_API void phpdbg_set_breakpoint_file(const char*, long TSRMLS_DC);
-PHPDBG_API void phpdbg_set_breakpoint_symbol(const char* TSRMLS_DC);
+PHPDBG_API void phpdbg_set_breakpoint_symbol(const char*, size_t TSRMLS_DC);
 PHPDBG_API void phpdbg_set_breakpoint_method(const char*, const char* TSRMLS_DC);
 PHPDBG_API void phpdbg_set_breakpoint_opcode(const char*, size_t TSRMLS_DC);
 PHPDBG_API void phpdbg_set_breakpoint_opline(zend_ulong TSRMLS_DC);

diff --git a/phpdbg_break.c b/phpdbg_break.c
index 9bc9b95436b0523180c64c433078354381f5cf95..22bd9f42fc3fdf1bcb1864f902e2c71f248ea963 100644 (file)
--- a/phpdbg_break.c
+++ b/phpdbg_break.c
@@ -100,7 +100,7 @@ PHPDBG_BREAK(func) /* {{{ */
 {
        switch (param->type) {
                case STR_PARAM:
-                       phpdbg_set_breakpoint_symbol(param->str TSRMLS_CC);
+                       phpdbg_set_breakpoint_symbol(param->str, param->len TSRMLS_CC);
                        break;
 
                phpdbg_default_switch_case();

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index 5c276ab8f8f8712626f7c52987e012cddc15230c..a2130653bf6359abb1dcfc6dc31a20e458f6f9c3 100644 (file)
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -784,7 +784,7 @@ PHPDBG_COMMAND(break) /* {{{ */
                        phpdbg_set_breakpoint_file(param->file.name, param->file.line TSRMLS_CC);
                        break;
                case STR_PARAM:
-                       phpdbg_set_breakpoint_symbol(param->str TSRMLS_CC);
+                       phpdbg_set_breakpoint_symbol(param->str, param->len TSRMLS_CC);
                        break;
 
                phpdbg_default_switch_case();