1 files changed, 22 insertions, 15 deletions

diff --git a/util-src/strbitop.c b/util-src/strbitop.c
index a26288e5..922048fd 100644
--- a/util-src/strbitop.c
+++ b/util-src/strbitop.c
@@ -2,7 +2,7 @@
  * This project is MIT licensed. Please see the
  * COPYING file in the source package for more information.
  *
- * Copyright (C) 2016 Kim Alvefur
+ * Copyright (C) 2016-2020 Kim Alvefur
  */
 
 #include <lua.h>
@@ -14,11 +14,11 @@
 
 /* TODO Deduplicate code somehow */
 
-int strop_and(lua_State* L) {
+int strop_and(lua_State *L) {
 	luaL_Buffer buf;
 	size_t a, b, i;
-	const char* str_a = luaL_checklstring(L, 1, &a);
-	const char* str_b = luaL_checklstring(L, 2, &b);
+	const char *str_a = luaL_checklstring(L, 1, &a);
+	const char *str_b = luaL_checklstring(L, 2, &b);
 
 	luaL_buffinit(L, &buf);
 
@@ -27,19 +27,22 @@ int strop_and(lua_State* L) {
 		return 1;
 	}
 
+	char *cbuf = luaL_buffinitsize(L, &buf, a);
+
 	for(i = 0; i < a; i++) {
-		luaL_addchar(&buf, str_a[i] & str_b[i % b]);
+		cbuf[i] = str_a[i] & str_b[i % b];
 	}
 
+	luaL_addsize(&buf, a);
 	luaL_pushresult(&buf);
 	return 1;
 }
 
-int strop_or(lua_State* L) {
+int strop_or(lua_State *L) {
 	luaL_Buffer buf;
 	size_t a, b, i;
-	const char* str_a = luaL_checklstring(L, 1, &a);
-	const char* str_b = luaL_checklstring(L, 2, &b);
+	const char *str_a = luaL_checklstring(L, 1, &a);
+	const char *str_b = luaL_checklstring(L, 2, &b);
 
 	luaL_buffinit(L, &buf);
 
@@ -48,31 +51,35 @@ int strop_or(lua_State* L) {
 		return 1;
 	}
 
+	char *cbuf = luaL_buffinitsize(L, &buf, a);
+
 	for(i = 0; i < a; i++) {
-		luaL_addchar(&buf, str_a[i] | str_b[i % b]);
+		cbuf[i] = str_a[i] | str_b[i % b];
 	}
 
+	luaL_addsize(&buf, a);
 	luaL_pushresult(&buf);
 	return 1;
 }
 
-int strop_xor(lua_State* L) {
+int strop_xor(lua_State *L) {
 	luaL_Buffer buf;
 	size_t a, b, i;
-	const char* str_a = luaL_checklstring(L, 1, &a);
-	const char* str_b = luaL_checklstring(L, 2, &b);
-
-	luaL_buffinit(L, &buf);
+	const char *str_a = luaL_checklstring(L, 1, &a);
+	const char *str_b = luaL_checklstring(L, 2, &b);
 
 	if(a == 0 || b == 0) {
 		lua_settop(L, 1);
 		return 1;
 	}
 
+	char *cbuf = luaL_buffinitsize(L, &buf, a);
+
 	for(i = 0; i < a; i++) {
-		luaL_addchar(&buf, str_a[i] ^ str_b[i % b]);
+		cbuf[i] = str_a[i] ^ str_b[i % b];
 	}
 
+	luaL_addsize(&buf, a);
 	luaL_pushresult(&buf);
 	return 1;
 }