Attachment #306935 for bug #409963







zend_function_entry syck_functions[] = {
	PHP_FE(syck_load, arginfo_syck_load)
	PHP_FE(syck_dump, arginfo_syck_dump)
	{NULL, NULL, NULL}	/* Must be the last line in syck_functions[] */


				strncpy(classname, n->type_id + 12, classname_len + 1);

				if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
					zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
					efree(classname);
					break;


				strncpy(classname, n->type_id + 11, classname_len + 1);

				if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
					zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
					efree(classname);
					break;


				strncpy(classname, n->type_id + 10, classname_len + 1);

				if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
					zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
					efree(classname);
					break;

Return to bug 409963

Lines 198-204 static int psex_determine_array_type(HashTable myht TSRMLS_DC) / {{{ */ Link Here

(-)a/ext/php/phpext.c (-4 / +4 lines)
198		198
199		199
200		200
201	function_entry syck_functions[] = {	201	zend_function_entry syck_functions[] = {
202	PHP_FE(syck_load, arginfo_syck_load)	202	PHP_FE(syck_load, arginfo_syck_load)
203	PHP_FE(syck_dump, arginfo_syck_dump)	203	PHP_FE(syck_dump, arginfo_syck_dump)
204	{NULL, NULL, NULL} /* Must be the last line in syck_functions[] */	204	{NULL, NULL, NULL} /* Must be the last line in syck_functions[] */
Lines 403-409 SYMID php_syck_handler(SyckParser p, SyckNode n) Link Here
403		403
404	strncpy(classname, n->type_id + 12, classname_len + 1);	404	strncpy(classname, n->type_id + 12, classname_len + 1);
405		405
406	if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {	406	if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
407	zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);	407	zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
408	efree(classname);	408	efree(classname);
409	break;	409	break;
Lines 439-445 SYMID php_syck_handler(SyckParser p, SyckNode n) Link Here
439		439
440	strncpy(classname, n->type_id + 11, classname_len + 1);	440	strncpy(classname, n->type_id + 11, classname_len + 1);
441		441
442	if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {	442	if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
443	zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);	443	zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
444	efree(classname);	444	efree(classname);
445	break;	445	break;
Lines 511-517 SYMID php_syck_handler(SyckParser p, SyckNode n) Link Here
511		511
512	strncpy(classname, n->type_id + 10, classname_len + 1);	512	strncpy(classname, n->type_id + 10, classname_len + 1);
513		513
514	if (FAILURE == zend_lookup_class_ex(classname, classname_len, 1, &ce TSRMLS_CC)) {	514	if (FAILURE == zend_lookup_class(classname, classname_len, &ce TSRMLS_CC)) {
515	zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);	515	zend_throw_exception_ex(syck_exception_entry, 0 TSRMLS_CC, "Couldn't find %s class on line %d, col %d: '%s'", classname, p->linect + 1, p->cursor - p->lineptr, p->lineptr);
516	efree(classname);	516	efree(classname);
517	break;	517	break;