diff options
Diffstat (limited to 'ext/ffi/ffi.c')
| -rw-r--r-- | ext/ffi/ffi.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/ext/ffi/ffi.c b/ext/ffi/ffi.c index 95ae8e3711..ba1130a64e 100644 --- a/ext/ffi/ffi.c +++ b/ext/ffi/ffi.c @@ -1605,12 +1605,8 @@ static zend_string *zend_ffi_get_class_name(zend_string *prefix, const zend_ffi_ if (!zend_ffi_ctype_name(&buf, type)) { return zend_string_copy(prefix); } else { - zend_string *name = zend_string_alloc(ZSTR_LEN(prefix) + 1 + buf.end - buf.start, 0); - memcpy(ZSTR_VAL(name), ZSTR_VAL(prefix), ZSTR_LEN(prefix)); - ZSTR_VAL(name)[ZSTR_LEN(prefix)] = ':'; - memcpy(ZSTR_VAL(name) + ZSTR_LEN(prefix) + 1, buf.start, buf.end - buf.start); - ZSTR_VAL(name)[ZSTR_LEN(name)] = 0; - return name; + return zend_string_concat3( + ZSTR_VAL(prefix), ZSTR_LEN(prefix), ":", 1, buf.start, buf.end - buf.start); } } /* }}} */ |