branch: externals/xeft commit 2fd4dd6ef86a96869af56837602ba3893a677d83 Author: Yuan Fu <caso...@gmail.com> Commit: Yuan Fu <caso...@gmail.com>
Update xapian-lite.cc * module/emacs-module-prelude.h: Sync with upstream. * module/xapian-lite.cc (copy_string): Sync with upstream. --- module/emacs-module-prelude.h | 5 +++-- module/xapian-lite.cc | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/emacs-module-prelude.h b/module/emacs-module-prelude.h index a4587652be..4edb9d1450 100644 --- a/module/emacs-module-prelude.h +++ b/module/emacs-module-prelude.h @@ -14,8 +14,9 @@ /* Copy a Lisp string VALUE into BUFFER, and store the string size in - SIZE. A user doesn’t need to allocate BUFFER, but it is the user’s - responsibility to free it. + SIZE. A user doesn’t need to allocate BUFFER, but it is the user’s + responsibility to free it. If failed, return false, and the buffer + doesn’t need to be freed. */ bool emp_copy_string_contents diff --git a/module/xapian-lite.cc b/module/xapian-lite.cc index 0b85ceaeb4..50a7eb9500 100644 --- a/module/xapian-lite.cc +++ b/module/xapian-lite.cc @@ -224,7 +224,6 @@ copy_string (emacs_env *env, emacs_value value) } else { - free (char_buffer); emp_signal_message1 (env, "xapian-lite-error", "Error turning lisp string to C++ string"); return "";