Merge pull request #37 from remicollet/issue-0310

chobie · chobie · commit 4d4fdd3b383b · 2013-12-15T00:50:34.000-08:00
fix segfault in sundown_render_base
diff --git a/php_sundown.h b/php_sundown.h
@@ -163,7 +163,7 @@ static int call_user_function_v(HashTable *function_table, zval **object_pp, zva
 	TSRMLS_FETCH();
 
 	if (param_count > 0) {
-		params = emalloc(sizeof(zval**) * param_count);
+		params = emalloc(sizeof(zval*) * param_count);
 		va_start(ap, param_count);
 		for (i=0; i<param_count;i++) {
 			params[i] = va_arg(ap, zval*);
diff --git a/render_base.c b/render_base.c
@@ -227,7 +227,8 @@ PHP_METHOD(sundown_render_base, blockHtml)
 PHP_METHOD(sundown_render_base, header)
 {
 	char *htext;
-	int htext_len, header_level;
+	int htext_len;
+	long header_level;
 	
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
 		"sl", &htext, &htext_len, &header_level) == FAILURE) {

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,8 @@ PHP_METHOD(sundown_render_base, blockHtml)`
`227`	`227`	`PHP_METHOD(sundown_render_base, header)`
`228`	`228`	`{`
`229`	`229`	`char *htext;`
`230`		`- int htext_len, header_level;`
	`230`	`+ int htext_len;`
	`231`	`+ long header_level;`
`231`	`232`
`232`	`233`	`if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,`
`233`	`234`	`"sl", &htext, &htext_len, &header_level) == FAILURE) {`