diff options
author | Philipp Stephani <phst@google.com> | 2019-04-22 15:43:52 +0200 |
---|---|---|
committer | Philipp Stephani <phst@google.com> | 2019-04-22 15:44:37 +0200 |
commit | f9659e648cd06a9322b501168b1af8ede7d1ae16 (patch) | |
tree | 78d556c9123a6b16417df082351a0b2cdb9019d1 | |
parent | ca3ad9746da5ced05e8fd692731ffe4dcb52d7e8 (diff) | |
download | emacs-f9659e648cd06a9322b501168b1af8ede7d1ae16.tar.gz |
Module API: Don’t require null-terminated strings in make_string.
* emacs-module.c (module_make_string): Use make_unibyte_string, which
doesn’t require its argument to be null-terminated. Since it always
returns a heap-allocated string, we don’t have to copy it any more
while decoding.
(module_decode): New helper function.
-rw-r--r-- | src/emacs-module.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/emacs-module.c b/src/emacs-module.c index 8fd2a87cc23..20dcff2b67a 100644 --- a/src/emacs-module.c +++ b/src/emacs-module.c @@ -212,6 +212,7 @@ static void module_reset_handlerlist (struct handler **); static bool value_storage_contains_p (const struct emacs_value_storage *, emacs_value, ptrdiff_t *); static Lisp_Object module_encode (Lisp_Object); +static Lisp_Object module_decode (Lisp_Object); static Lisp_Object module_decode_copy (Lisp_Object); static bool module_assertions = false; @@ -629,10 +630,8 @@ module_make_string (emacs_env *env, const char *str, ptrdiff_t length) MODULE_FUNCTION_BEGIN (NULL); if (! (0 <= length && length <= STRING_BYTES_BOUND)) overflow_error (); - /* FIXME: AUTO_STRING_WITH_LEN requires STR to be NUL-terminated, - but we shouldn't require that. */ - AUTO_STRING_WITH_LEN (lstr, str, length); - return lisp_to_value (env, module_decode_copy (lstr)); + Lisp_Object lstr = make_unibyte_string (str, length); + return lisp_to_value (env, module_decode (lstr)); } static emacs_value @@ -947,6 +946,12 @@ module_encode (Lisp_Object string) } static Lisp_Object +module_decode (Lisp_Object string) +{ + return code_convert_string (string, Qutf_8_unix, Qt, false, true, true); +} + +static Lisp_Object module_decode_copy (Lisp_Object string) { return code_convert_string (string, Qutf_8_unix, Qt, false, false, true); |