From ed3115bd26047c9b125798d9cb56d09b155a243b Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 11 Jul 2016 20:42:27 +0300
Subject: executor: Make sure it works with API values

---
 src/nvim/api/vim.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 413456c615..24959e9a59 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -197,7 +197,21 @@ Object nvim_eval(String expr, Error *err)
   return rv;
 }
 
-/// Calls a VimL function with the given arguments.
+/// Returns object given as argument
+///
+/// This API function is used for testing. One should not rely on its presence
+/// in plugins.
+///
+/// @param[in]  obj  Object to return.
+///
+/// @return its argument.
+Object _vim_id(Object obj)
+{
+  return obj;
+}
+
+/// Calls a VimL function with the given arguments
+///
 /// On VimL error: Returns a generic error; v:errmsg is not updated.
 ///
 /// @param fname    Function to call
-- 
cgit 


From 425d348f0f9f680a44af31fc3cecd20a07374bb5 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 16 Jul 2016 00:34:24 +0300
Subject: executor/converter: Make nlua_pop_Object not recursive

---
 src/nvim/api/private/defs.h |  2 +-
 src/nvim/api/vim.c          | 54 ++++++++++++++++++++++++++++++++++-----------
 2 files changed, 42 insertions(+), 14 deletions(-)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/private/defs.h b/src/nvim/api/private/defs.h
index 223aab09dc..86b549cb44 100644
--- a/src/nvim/api/private/defs.h
+++ b/src/nvim/api/private/defs.h
@@ -76,10 +76,10 @@ typedef struct {
 } Dictionary;
 
 typedef enum {
+  kObjectTypeNil = 0,
   kObjectTypeBuffer,
   kObjectTypeWindow,
   kObjectTypeTabpage,
-  kObjectTypeNil,
   kObjectTypeBoolean,
   kObjectTypeInteger,
   kObjectTypeFloat,
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 24959e9a59..5d862628cb 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -197,19 +197,6 @@ Object nvim_eval(String expr, Error *err)
   return rv;
 }
 
-/// Returns object given as argument
-///
-/// This API function is used for testing. One should not rely on its presence
-/// in plugins.
-///
-/// @param[in]  obj  Object to return.
-///
-/// @return its argument.
-Object _vim_id(Object obj)
-{
-  return obj;
-}
-
 /// Calls a VimL function with the given arguments
 ///
 /// On VimL error: Returns a generic error; v:errmsg is not updated.
@@ -843,3 +830,44 @@ static void write_msg(String message, bool to_err)
   --no_wait_return;
   msg_end();
 }
+
+// Functions used for testing purposes
+
+/// Returns object given as argument
+///
+/// This API function is used for testing. One should not rely on its presence
+/// in plugins.
+///
+/// @param[in]  obj  Object to return.
+///
+/// @return its argument.
+Object _vim_id(Object obj)
+{
+  return obj;
+}
+
+/// Returns array given as argument
+///
+/// This API function is used for testing. One should not rely on its presence
+/// in plugins.
+///
+/// @param[in]  arr  Array to return.
+///
+/// @return its argument.
+Array _vim_id_array(Array arr)
+{
+  return arr;
+}
+
+/// Returns dictionary given as argument
+///
+/// This API function is used for testing. One should not rely on its presence
+/// in plugins.
+///
+/// @param[in]  dct  Dictionary to return.
+///
+/// @return its argument.
+Dictionary _vim_id_dictionary(Dictionary dct)
+{
+  return dct;
+}
-- 
cgit 


From ba2f615cd40d5d809d1a141c7b098e3bd22ff7bb Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 16 Jul 2016 02:26:04 +0300
Subject: functests: Test for error conditions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

During testing found the following bugs:

1. msgpack-gen.lua script is completely unprepared for Float values either in
   return type or in arguments. Specifically:

   1. At the time of writing relevant code FLOAT_OBJ did not exist as well as
      FLOATING_OBJ, but it would be used by msgpack-gen.lua should return type
      be Float. I added FLOATING_OBJ macros later because did not know that
      msgpack-gen.lua uses these _OBJ macros, otherwise it would be FLOAT_OBJ.
   2. msgpack-gen.lua should use .data.floating in place of .data.float. But it
      did not expect that .data subattribute may have name different from
      lowercased type name.

2. vim_replace_termcodes returned its argument as-is if it receives an empty
   string (as well as _vim_id*() functions did). But if something in returned
   argument lives in an allocated memory such action will cause double free:
   once when freeing arguments, then when freeing return value. It did not cause
   problems yet because msgpack bindings return empty string as {NULL, 0} and
   nothing was actually allocated.
3. New code in msgpack-gen.lua popped arguments in reversed order, making lua
   bindings’ signatures be different from API ones.
---
 src/nvim/api/private/helpers.c |  2 +-
 src/nvim/api/private/helpers.h |  2 +-
 src/nvim/api/vim.c             | 21 +++++++++++++++++----
 3 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index 7efa086af2..23d1540e2f 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -351,7 +351,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
 #define TYPVAL_ENCODE_CONV_UNSIGNED_NUMBER TYPVAL_ENCODE_CONV_NUMBER
 
 #define TYPVAL_ENCODE_CONV_FLOAT(tv, flt) \
-    kv_push(edata->stack, FLOATING_OBJ((Float)(flt)))
+    kv_push(edata->stack, FLOAT_OBJ((Float)(flt)))
 
 #define TYPVAL_ENCODE_CONV_STRING(tv, str, len) \
     do { \
diff --git a/src/nvim/api/private/helpers.h b/src/nvim/api/private/helpers.h
index 9fe8c351cf..640e901fa1 100644
--- a/src/nvim/api/private/helpers.h
+++ b/src/nvim/api/private/helpers.h
@@ -27,7 +27,7 @@
     .type = kObjectTypeInteger, \
     .data.integer = i })
 
-#define FLOATING_OBJ(f) ((Object) { \
+#define FLOAT_OBJ(f) ((Object) { \
     .type = kObjectTypeFloat, \
     .data.floating = f })
 
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 5d862628cb..3fd1f57ace 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -139,7 +139,7 @@ String nvim_replace_termcodes(String str, Boolean from_part, Boolean do_lt,
 {
   if (str.size == 0) {
     // Empty string
-    return str;
+    return (String) { .data = NULL, .size = 0 };
   }
 
   char *ptr = NULL;
@@ -843,7 +843,7 @@ static void write_msg(String message, bool to_err)
 /// @return its argument.
 Object _vim_id(Object obj)
 {
-  return obj;
+  return copy_object(obj);
 }
 
 /// Returns array given as argument
@@ -856,7 +856,7 @@ Object _vim_id(Object obj)
 /// @return its argument.
 Array _vim_id_array(Array arr)
 {
-  return arr;
+  return copy_object(ARRAY_OBJ(arr)).data.array;
 }
 
 /// Returns dictionary given as argument
@@ -869,5 +869,18 @@ Array _vim_id_array(Array arr)
 /// @return its argument.
 Dictionary _vim_id_dictionary(Dictionary dct)
 {
-  return dct;
+  return copy_object(DICTIONARY_OBJ(dct)).data.dictionary;
+}
+
+/// Returns floating-point value given as argument
+///
+/// This API function is used for testing. One should not rely on its presence
+/// in plugins.
+///
+/// @param[in]  flt  Value to return.
+///
+/// @return its argument.
+Float _vim_id_float(Float flt)
+{
+  return flt;
 }
-- 
cgit 


From 5c1b9a0d2af86461f56f0d27ed275456921f6187 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Fri, 20 Jan 2017 23:06:22 +0300
Subject: api: Reserve more numbers for internal calls
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reasoning; currently INTERNAL_CALL is mostly used to determine whether it is
needed to deal with NL-used-as-NUL problem. This code is useful for nvim_… API
calls done from VimL, but not for API calls done from lua, yet lua needs to
supply something as channel_id.
---
 src/nvim/api/buffer.c       |  4 ++--
 src/nvim/api/private/defs.h | 27 +++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index b75a2c7211..5eda88025f 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -192,7 +192,7 @@ ArrayOf(String) nvim_buf_get_lines(uint64_t channel_id,
     Object str = STRING_OBJ(cstr_to_string(bufstr));
 
     // Vim represents NULs as NLs, but this may confuse clients.
-    if (channel_id != INTERNAL_CALL) {
+    if (channel_id != VIML_INTERNAL_CALL) {
       strchrsub(str.data.string.data, '\n', '\0');
     }
 
@@ -313,7 +313,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
     // line and convert NULs to newlines to avoid truncation.
     lines[i] = xmallocz(l.size);
     for (size_t j = 0; j < l.size; j++) {
-      if (l.data[j] == '\n' && channel_id != INTERNAL_CALL) {
+      if (l.data[j] == '\n' && channel_id != VIML_INTERNAL_CALL) {
         api_set_error(err, Exception, _("string cannot contain newlines"));
         new_len = i + 1;
         goto end;
diff --git a/src/nvim/api/private/defs.h b/src/nvim/api/private/defs.h
index 86b549cb44..cb7ee8eb4c 100644
--- a/src/nvim/api/private/defs.h
+++ b/src/nvim/api/private/defs.h
@@ -5,6 +5,8 @@
 #include <stdbool.h>
 #include <string.h>
 
+#include "nvim/func_attr.h"
+
 #define ARRAY_DICT_INIT {.size = 0, .capacity = 0, .items = NULL}
 #define STRING_INIT {.data = NULL, .size = 0}
 #define OBJECT_INIT { .type = kObjectTypeNil }
@@ -33,8 +35,29 @@ typedef enum {
 /// Used as the message ID of notifications.
 #define NO_RESPONSE UINT64_MAX
 
-/// Used as channel_id when the call is local.
-#define INTERNAL_CALL UINT64_MAX
+/// Mask for all internal calls
+#define INTERNAL_CALL_MASK (UINT64_MAX ^ (UINT64_MAX >> 1))
+// (1 << 63) in all forms produces “warning: shift count >= width of type
+// [-Wshift-count-overflow]”
+
+/// Internal call from VimL code
+#define VIML_INTERNAL_CALL INTERNAL_CALL_MASK
+
+/// Internal call from lua code
+#define LUA_INTERNAL_CALL (VIML_INTERNAL_CALL + 1)
+
+static inline bool is_internal_call(uint64_t channel_id)
+  REAL_FATTR_ALWAYS_INLINE REAL_FATTR_CONST;
+
+/// Check whether call is internal
+///
+/// @param[in]  channel_id  Channel id.
+///
+/// @return true if channel_id refers to internal channel.
+static inline bool is_internal_call(const uint64_t channel_id)
+{
+  return !!(channel_id & INTERNAL_CALL_MASK);
+}
 
 typedef struct {
   ErrorType type;
-- 
cgit 


From ca4c8b7f8a7b9543ef01157cb5ab94783f624ac6 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 22 Jan 2017 04:55:26 +0300
Subject: api: Allow kObjectTypeNil to be zero without breaking compatibility

---
 src/nvim/api/private/defs.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/private/defs.h b/src/nvim/api/private/defs.h
index cb7ee8eb4c..432ab347bc 100644
--- a/src/nvim/api/private/defs.h
+++ b/src/nvim/api/private/defs.h
@@ -100,15 +100,16 @@ typedef struct {
 
 typedef enum {
   kObjectTypeNil = 0,
-  kObjectTypeBuffer,
-  kObjectTypeWindow,
-  kObjectTypeTabpage,
   kObjectTypeBoolean,
   kObjectTypeInteger,
   kObjectTypeFloat,
   kObjectTypeString,
   kObjectTypeArray,
   kObjectTypeDictionary,
+  // EXT types, cannot be split or reordered, see #EXT_OBJECT_TYPE_SHIFT
+  kObjectTypeBuffer,
+  kObjectTypeWindow,
+  kObjectTypeTabpage,
 } ObjectType;
 
 struct object {
-- 
cgit 


From 62fde319360e27a86c0deba0053ff230f80ca772 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 29 Jan 2017 01:29:51 +0300
Subject: api: Also shift numbers in api_metadata output
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes problem introduced by “api: Allow kObjectTypeNil to be zero without
breaking compatibility”: apparently there are clients which use metadata and
there are which aren’t. For the first that commit would not be needed, for the
second that commit misses this critical piece.
---
 src/nvim/api/private/helpers.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index 23d1540e2f..373e509120 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -851,15 +851,18 @@ static void init_type_metadata(Dictionary *metadata)
   Dictionary types = ARRAY_DICT_INIT;
 
   Dictionary buffer_metadata = ARRAY_DICT_INIT;
-  PUT(buffer_metadata, "id", INTEGER_OBJ(kObjectTypeBuffer));
+  PUT(buffer_metadata, "id",
+      INTEGER_OBJ(kObjectTypeBuffer - EXT_OBJECT_TYPE_SHIFT));
   PUT(buffer_metadata, "prefix", STRING_OBJ(cstr_to_string("nvim_buf_")));
 
   Dictionary window_metadata = ARRAY_DICT_INIT;
-  PUT(window_metadata, "id", INTEGER_OBJ(kObjectTypeWindow));
+  PUT(window_metadata, "id",
+      INTEGER_OBJ(kObjectTypeWindow - EXT_OBJECT_TYPE_SHIFT));
   PUT(window_metadata, "prefix", STRING_OBJ(cstr_to_string("nvim_win_")));
 
   Dictionary tabpage_metadata = ARRAY_DICT_INIT;
-  PUT(tabpage_metadata, "id", INTEGER_OBJ(kObjectTypeTabpage));
+  PUT(tabpage_metadata, "id",
+      INTEGER_OBJ(kObjectTypeTabpage - EXT_OBJECT_TYPE_SHIFT));
   PUT(tabpage_metadata, "prefix", STRING_OBJ(cstr_to_string("nvim_tabpage_")));
 
   PUT(types, "Buffer", DICTIONARY_OBJ(buffer_metadata));
-- 
cgit 


From f2ad6201d94fec1e0c98550e55f3b069fa24a68b Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 29 Jan 2017 21:03:36 +0300
Subject: api: Use a form of `1 << 63` for INTERNAL_CALL_MASK

---
 src/nvim/api/private/defs.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/private/defs.h b/src/nvim/api/private/defs.h
index 432ab347bc..8bd1dd5085 100644
--- a/src/nvim/api/private/defs.h
+++ b/src/nvim/api/private/defs.h
@@ -36,9 +36,7 @@ typedef enum {
 #define NO_RESPONSE UINT64_MAX
 
 /// Mask for all internal calls
-#define INTERNAL_CALL_MASK (UINT64_MAX ^ (UINT64_MAX >> 1))
-// (1 << 63) in all forms produces “warning: shift count >= width of type
-// [-Wshift-count-overflow]”
+#define INTERNAL_CALL_MASK (((uint64_t)1) << (sizeof(uint64_t) * 8 - 1))
 
 /// Internal call from VimL code
 #define VIML_INTERNAL_CALL INTERNAL_CALL_MASK
-- 
cgit 


From 7b6b629e1a1e3c9f49f75f3bf2c53bb76f77e209 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 8 Apr 2017 20:30:26 +0300
Subject: api: Add FUNC_API_SINCE(1) to new functions

---
 src/nvim/api/vim.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 511c87f408..05317b8d69 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -844,6 +844,7 @@ static void write_msg(String message, bool to_err)
 ///
 /// @return its argument.
 Object _vim_id(Object obj)
+    FUNC_API_SINCE(1)
 {
   return copy_object(obj);
 }
@@ -857,6 +858,7 @@ Object _vim_id(Object obj)
 ///
 /// @return its argument.
 Array _vim_id_array(Array arr)
+    FUNC_API_SINCE(1)
 {
   return copy_object(ARRAY_OBJ(arr)).data.array;
 }
@@ -870,6 +872,7 @@ Array _vim_id_array(Array arr)
 ///
 /// @return its argument.
 Dictionary _vim_id_dictionary(Dictionary dct)
+    FUNC_API_SINCE(1)
 {
   return copy_object(DICTIONARY_OBJ(dct)).data.dictionary;
 }
@@ -883,6 +886,7 @@ Dictionary _vim_id_dictionary(Dictionary dct)
 ///
 /// @return its argument.
 Float _vim_id_float(Float flt)
+    FUNC_API_SINCE(1)
 {
   return flt;
 }
-- 
cgit 


From a40a969e9a4776f1e274dcf0e59c8f1ec1770ca0 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 8 Apr 2017 20:33:48 +0300
Subject: api: Rename _vim_id functions to nvim__id

---
 src/nvim/api/vim.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 05317b8d69..9ee3827040 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -843,7 +843,7 @@ static void write_msg(String message, bool to_err)
 /// @param[in]  obj  Object to return.
 ///
 /// @return its argument.
-Object _vim_id(Object obj)
+Object nvim__id(Object obj)
     FUNC_API_SINCE(1)
 {
   return copy_object(obj);
@@ -857,7 +857,7 @@ Object _vim_id(Object obj)
 /// @param[in]  arr  Array to return.
 ///
 /// @return its argument.
-Array _vim_id_array(Array arr)
+Array nvim__id_array(Array arr)
     FUNC_API_SINCE(1)
 {
   return copy_object(ARRAY_OBJ(arr)).data.array;
@@ -871,7 +871,7 @@ Array _vim_id_array(Array arr)
 /// @param[in]  dct  Dictionary to return.
 ///
 /// @return its argument.
-Dictionary _vim_id_dictionary(Dictionary dct)
+Dictionary nvim__id_dictionary(Dictionary dct)
     FUNC_API_SINCE(1)
 {
   return copy_object(DICTIONARY_OBJ(dct)).data.dictionary;
@@ -885,7 +885,7 @@ Dictionary _vim_id_dictionary(Dictionary dct)
 /// @param[in]  flt  Value to return.
 ///
 /// @return its argument.
-Float _vim_id_float(Float flt)
+Float nvim__id_float(Float flt)
     FUNC_API_SINCE(1)
 {
   return flt;
-- 
cgit 


From f3093bc508631930d41e9603b43687f4e51af2b3 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 10 Apr 2017 23:10:01 +0300
Subject: api: Bump nvim__*id functions since value

---
 src/nvim/api/vim.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 9ee3827040..0056ea1725 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -844,7 +844,7 @@ static void write_msg(String message, bool to_err)
 ///
 /// @return its argument.
 Object nvim__id(Object obj)
-    FUNC_API_SINCE(1)
+    FUNC_API_SINCE(2)
 {
   return copy_object(obj);
 }
@@ -858,7 +858,7 @@ Object nvim__id(Object obj)
 ///
 /// @return its argument.
 Array nvim__id_array(Array arr)
-    FUNC_API_SINCE(1)
+    FUNC_API_SINCE(2)
 {
   return copy_object(ARRAY_OBJ(arr)).data.array;
 }
@@ -872,7 +872,7 @@ Array nvim__id_array(Array arr)
 ///
 /// @return its argument.
 Dictionary nvim__id_dictionary(Dictionary dct)
-    FUNC_API_SINCE(1)
+    FUNC_API_SINCE(2)
 {
   return copy_object(DICTIONARY_OBJ(dct)).data.dictionary;
 }
@@ -886,7 +886,7 @@ Dictionary nvim__id_dictionary(Dictionary dct)
 ///
 /// @return its argument.
 Float nvim__id_float(Float flt)
-    FUNC_API_SINCE(1)
+    FUNC_API_SINCE(2)
 {
   return flt;
 }
-- 
cgit 


From 1bd39fb8d009f5ff62023d0f2fe86bbcdaeb3abc Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 11 Apr 2017 23:59:05 +0300
Subject: api: Remove FUNC_API_SINCE for nvim__ functions

---
 src/nvim/api/vim.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 0056ea1725..1d44e779c7 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -844,7 +844,6 @@ static void write_msg(String message, bool to_err)
 ///
 /// @return its argument.
 Object nvim__id(Object obj)
-    FUNC_API_SINCE(2)
 {
   return copy_object(obj);
 }
@@ -858,7 +857,6 @@ Object nvim__id(Object obj)
 ///
 /// @return its argument.
 Array nvim__id_array(Array arr)
-    FUNC_API_SINCE(2)
 {
   return copy_object(ARRAY_OBJ(arr)).data.array;
 }
@@ -872,7 +870,6 @@ Array nvim__id_array(Array arr)
 ///
 /// @return its argument.
 Dictionary nvim__id_dictionary(Dictionary dct)
-    FUNC_API_SINCE(2)
 {
   return copy_object(DICTIONARY_OBJ(dct)).data.dictionary;
 }
@@ -886,7 +883,6 @@ Dictionary nvim__id_dictionary(Dictionary dct)
 ///
 /// @return its argument.
 Float nvim__id_float(Float flt)
-    FUNC_API_SINCE(2)
 {
   return flt;
 }
-- 
cgit 


From 1d7fde39a6927d01de74aefb540ad445bfdfbfda Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Wed, 12 Apr 2017 00:31:01 +0300
Subject: api/buffer: Validate replacement array in a separate cycle

Should not really change anything, but code should be more efficient by using
more optimized libc functions (memchrsub is not libc, but it uses memchr) in
place of a cycle.
---
 src/nvim/api/buffer.c | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 611f29f1f2..0a7b7982e2 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -292,6 +292,23 @@ void nvim_buf_set_lines(uint64_t channel_id,
     return;
   }
 
+  for (size_t i = 0; i < replacement.size; i++) {
+    if (replacement.items[i].type != kObjectTypeString) {
+      api_set_error(err,
+                    Validation,
+                    _("All items in the replacement array must be strings"));
+      return;
+    }
+    // Disallow newlines in the middle of the line.
+    if (channel_id != VIML_INTERNAL_CALL) {
+      const String l = replacement.items[i].data.string;
+      if (memchr(l.data, NL, l.size)) {
+        api_set_error(err, Validation, _("string cannot contain newlines"));
+        return;
+      }
+    }
+  }
+
   win_T *save_curwin = NULL;
   tabpage_T *save_curtab = NULL;
   size_t new_len = replacement.size;
@@ -300,26 +317,12 @@ void nvim_buf_set_lines(uint64_t channel_id,
   char **lines = (new_len != 0) ? xcalloc(new_len, sizeof(char *)) : NULL;
 
   for (size_t i = 0; i < new_len; i++) {
-    if (replacement.items[i].type != kObjectTypeString) {
-      api_set_error(err,
-                    Validation,
-                    _("All items in the replacement array must be strings"));
-      goto end;
-    }
-
-    String l = replacement.items[i].data.string;
+    const String l = replacement.items[i].data.string;
 
-    // Fill lines[i] with l's contents. Disallow newlines in the middle of a
-    // line and convert NULs to newlines to avoid truncation.
-    lines[i] = xmallocz(l.size);
-    for (size_t j = 0; j < l.size; j++) {
-      if (l.data[j] == '\n' && channel_id != VIML_INTERNAL_CALL) {
-        api_set_error(err, Exception, _("string cannot contain newlines"));
-        new_len = i + 1;
-        goto end;
-      }
-      lines[i][j] = (char) (l.data[j] == '\0' ? '\n' : l.data[j]);
-    }
+    // Fill lines[i] with l's contents. Convert NULs to newlines as required by
+    // NL-used-for-NUL.
+    lines[i] = xmemdupz(l.data, l.size);
+    memchrsub(lines[i], NUL, NL, l.size);
   }
 
   try_start();
-- 
cgit 


From 85bf64da0a06a06548fb06838eddb884fcaef38b Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 8 May 2017 20:55:00 +0300
Subject: api/window: Fix memory leak in nvim_win_set_cursor

---
 src/nvim/api/window.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/nvim/api')

diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index 859bf88398..22902800ea 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -62,6 +62,10 @@ void nvim_win_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err)
 {
   win_T *win = find_window_by_handle(window, err);
 
+  if (!win) {
+    return;
+  }
+
   if (pos.size != 2 || pos.items[0].type != kObjectTypeInteger
       || pos.items[1].type != kObjectTypeInteger) {
     api_set_error(err,
@@ -70,10 +74,6 @@ void nvim_win_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err)
     return;
   }
 
-  if (!win) {
-    return;
-  }
-
   int64_t row = pos.items[0].data.integer;
   int64_t col = pos.items[1].data.integer;
 
-- 
cgit