Changeset 390 for trunk/ext
- Timestamp:
- 03/23/07 12:33:15 (2 years ago)
- Files:
-
- trunk/ext/jelix/jelix.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/ext/jelix/jelix.c
r389 r390 607 607 char *r; 608 608 int ld = sizeof("default_") -1; 609 int lr = ld + resource_length +1;610 r= emalloc(lr );609 int lr = ld + resource_length; 610 r= emalloc(lr+1); 611 611 if (r) { 612 612 memcpy(r, "default_", ld); 613 613 memcpy(r+ld, resource, resource_length); 614 614 r[lr] = 0; 615 zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1, r, lr -1TSRMLS_CC);615 zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1, r, lr TSRMLS_CC); 616 616 efree(r); 617 617 } … … 623 623 char *r; 624 624 int ld = sizeof("default") -1; 625 int lr = ld + resource_length + 1;626 r= emalloc(lr );625 int lr = ld + resource_length; 626 r= emalloc(lr+1); 627 627 if (r) { 628 628 memcpy(r, "default", ld); 629 629 memcpy(r+ld, resource, resource_length); 630 630 r[lr] = 0; 631 zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1, r, lr -1TSRMLS_CC);631 zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1, r, lr TSRMLS_CC); 632 632 efree(r); 633 633 } … … 638 638 char *r; 639 639 int ld = sizeof("index") -1; 640 int lr = ld + resource_length +1;641 r= emalloc(lr );640 int lr = resource_length + ld; 641 r= emalloc(lr+1); 642 642 if (r) { 643 643 memcpy(r, resource, resource_length); 644 644 memcpy(r+resource_length, "index", ld); 645 645 r[lr] = 0; 646 zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1, r, lr -1TSRMLS_CC);646 zend_update_property_stringl(Z_OBJCE_P(*objectArg), *objectArg, "resource", sizeof("resource") - 1, r, lr TSRMLS_CC); 647 647 efree(r); 648 648 }
