filter-modify: UTF8 encode to stack or heap, depending on encoded length

nigels-com · nigels-com · commit f2f1bbb605b7 · 2019-10-22T22:28:18.000+10:00
Signed-off-by: Nigel Stewart &lt;nigels@nigels.com&gt;
diff --git a/lib/tutf8e/codegen.py b/lib/tutf8e/codegen.py
@@ -133,6 +133,11 @@
     name = e.replace('-', '_').lower()
     include.write('extern char * % -33s(char *input);\n'%('tutf8e_string_encode_%s_realloc'%(name)))
 
+  include.write('\n/* Buffer length as UTF8 */\n')
+  for e in sorted(encodings):
+    name = e.replace('-', '_').lower()
+    include.write('extern int % -33s(const char *i, size_t ilen, size_t *length);\n'%('tutf8e_buffer_length_%s'%(name)))
+
   include.write('\n/* Encode buffer to UTF8 */\n')
   for e in sorted(encodings):
     name = e.replace('-', '_').lower()
@@ -182,6 +187,13 @@
       src.write('  return tutf8e_buffer_encode(%s_utf8, input, len, output, &olen);\n'%(name))
       src.write('}\n')
 
+      src.write('''
+int tutf8e_buffer_length_%s(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(%s_utf8, i, ilen, length);
+}
+'''%(name, name))
+
       src.write('\n')
       src.write('int tutf8e_buffer_encode_%s(char *output, size_t *olen, const char *input, size_t ilen)\n'%(name))
       src.write('{\n')
diff --git a/lib/tutf8e/include/tutf8e.h b/lib/tutf8e/include/tutf8e.h
@@ -68,6 +68,32 @@ extern char * tutf8e_string_encode_windows_1256_realloc(char *input);
 extern char * tutf8e_string_encode_windows_1257_realloc(char *input);
 extern char * tutf8e_string_encode_windows_1258_realloc(char *input);
 
+/* Buffer length as UTF8 */
+extern int tutf8e_buffer_length_iso_8859_1  (const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_iso_8859_10 (const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_iso_8859_11 (const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_iso_8859_13 (const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_iso_8859_14 (const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_iso_8859_15 (const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_iso_8859_16 (const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_iso_8859_2  (const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_iso_8859_3  (const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_iso_8859_4  (const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_iso_8859_5  (const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_iso_8859_6  (const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_iso_8859_7  (const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_iso_8859_8  (const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_iso_8859_9  (const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_windows_1250(const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_windows_1251(const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_windows_1252(const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_windows_1253(const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_windows_1254(const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_windows_1255(const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_windows_1256(const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_windows_1257(const char *i, size_t ilen, size_t *length);
+extern int tutf8e_buffer_length_windows_1258(const char *i, size_t ilen, size_t *length);
+
 /* Encode buffer to UTF8 */
 extern int tutf8e_buffer_encode_iso_8859_1  (char *output, size_t *olen, const char *input, size_t ilen);
 extern int tutf8e_buffer_encode_iso_8859_10 (char *output, size_t *olen, const char *input, size_t ilen);
diff --git a/lib/tutf8e/src/iso_8859_1.c b/lib/tutf8e/src/iso_8859_1.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_1(char *output, size_t olen, const char *input
   return tutf8e_buffer_encode(iso_8859_1_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_iso_8859_1(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(iso_8859_1_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_iso_8859_1(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(iso_8859_1_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/iso_8859_10.c b/lib/tutf8e/src/iso_8859_10.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_10(char *output, size_t olen, const char *inpu
   return tutf8e_buffer_encode(iso_8859_10_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_iso_8859_10(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(iso_8859_10_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_iso_8859_10(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(iso_8859_10_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/iso_8859_11.c b/lib/tutf8e/src/iso_8859_11.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_11(char *output, size_t olen, const char *inpu
   return tutf8e_buffer_encode(iso_8859_11_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_iso_8859_11(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(iso_8859_11_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_iso_8859_11(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(iso_8859_11_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/iso_8859_13.c b/lib/tutf8e/src/iso_8859_13.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_13(char *output, size_t olen, const char *inpu
   return tutf8e_buffer_encode(iso_8859_13_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_iso_8859_13(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(iso_8859_13_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_iso_8859_13(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(iso_8859_13_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/iso_8859_14.c b/lib/tutf8e/src/iso_8859_14.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_14(char *output, size_t olen, const char *inpu
   return tutf8e_buffer_encode(iso_8859_14_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_iso_8859_14(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(iso_8859_14_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_iso_8859_14(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(iso_8859_14_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/iso_8859_15.c b/lib/tutf8e/src/iso_8859_15.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_15(char *output, size_t olen, const char *inpu
   return tutf8e_buffer_encode(iso_8859_15_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_iso_8859_15(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(iso_8859_15_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_iso_8859_15(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(iso_8859_15_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/iso_8859_16.c b/lib/tutf8e/src/iso_8859_16.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_16(char *output, size_t olen, const char *inpu
   return tutf8e_buffer_encode(iso_8859_16_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_iso_8859_16(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(iso_8859_16_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_iso_8859_16(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(iso_8859_16_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/iso_8859_2.c b/lib/tutf8e/src/iso_8859_2.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_2(char *output, size_t olen, const char *input
   return tutf8e_buffer_encode(iso_8859_2_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_iso_8859_2(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(iso_8859_2_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_iso_8859_2(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(iso_8859_2_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/iso_8859_3.c b/lib/tutf8e/src/iso_8859_3.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_3(char *output, size_t olen, const char *input
   return tutf8e_buffer_encode(iso_8859_3_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_iso_8859_3(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(iso_8859_3_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_iso_8859_3(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(iso_8859_3_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/iso_8859_4.c b/lib/tutf8e/src/iso_8859_4.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_4(char *output, size_t olen, const char *input
   return tutf8e_buffer_encode(iso_8859_4_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_iso_8859_4(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(iso_8859_4_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_iso_8859_4(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(iso_8859_4_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/iso_8859_5.c b/lib/tutf8e/src/iso_8859_5.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_5(char *output, size_t olen, const char *input
   return tutf8e_buffer_encode(iso_8859_5_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_iso_8859_5(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(iso_8859_5_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_iso_8859_5(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(iso_8859_5_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/iso_8859_6.c b/lib/tutf8e/src/iso_8859_6.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_6(char *output, size_t olen, const char *input
   return tutf8e_buffer_encode(iso_8859_6_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_iso_8859_6(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(iso_8859_6_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_iso_8859_6(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(iso_8859_6_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/iso_8859_7.c b/lib/tutf8e/src/iso_8859_7.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_7(char *output, size_t olen, const char *input
   return tutf8e_buffer_encode(iso_8859_7_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_iso_8859_7(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(iso_8859_7_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_iso_8859_7(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(iso_8859_7_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/iso_8859_8.c b/lib/tutf8e/src/iso_8859_8.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_8(char *output, size_t olen, const char *input
   return tutf8e_buffer_encode(iso_8859_8_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_iso_8859_8(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(iso_8859_8_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_iso_8859_8(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(iso_8859_8_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/iso_8859_9.c b/lib/tutf8e/src/iso_8859_9.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_9(char *output, size_t olen, const char *input
   return tutf8e_buffer_encode(iso_8859_9_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_iso_8859_9(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(iso_8859_9_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_iso_8859_9(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(iso_8859_9_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/windows_1250.c b/lib/tutf8e/src/windows_1250.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_windows_1250(char *output, size_t olen, const char *inp
   return tutf8e_buffer_encode(windows_1250_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_windows_1250(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(windows_1250_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_windows_1250(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(windows_1250_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/windows_1251.c b/lib/tutf8e/src/windows_1251.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_windows_1251(char *output, size_t olen, const char *inp
   return tutf8e_buffer_encode(windows_1251_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_windows_1251(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(windows_1251_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_windows_1251(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(windows_1251_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/windows_1252.c b/lib/tutf8e/src/windows_1252.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_windows_1252(char *output, size_t olen, const char *inp
   return tutf8e_buffer_encode(windows_1252_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_windows_1252(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(windows_1252_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_windows_1252(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(windows_1252_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/windows_1253.c b/lib/tutf8e/src/windows_1253.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_windows_1253(char *output, size_t olen, const char *inp
   return tutf8e_buffer_encode(windows_1253_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_windows_1253(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(windows_1253_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_windows_1253(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(windows_1253_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/windows_1254.c b/lib/tutf8e/src/windows_1254.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_windows_1254(char *output, size_t olen, const char *inp
   return tutf8e_buffer_encode(windows_1254_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_windows_1254(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(windows_1254_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_windows_1254(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(windows_1254_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/windows_1255.c b/lib/tutf8e/src/windows_1255.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_windows_1255(char *output, size_t olen, const char *inp
   return tutf8e_buffer_encode(windows_1255_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_windows_1255(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(windows_1255_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_windows_1255(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(windows_1255_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/windows_1256.c b/lib/tutf8e/src/windows_1256.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_windows_1256(char *output, size_t olen, const char *inp
   return tutf8e_buffer_encode(windows_1256_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_windows_1256(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(windows_1256_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_windows_1256(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(windows_1256_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/windows_1257.c b/lib/tutf8e/src/windows_1257.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_windows_1257(char *output, size_t olen, const char *inp
   return tutf8e_buffer_encode(windows_1257_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_windows_1257(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(windows_1257_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_windows_1257(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(windows_1257_utf8, input, ilen, output, olen);
diff --git a/lib/tutf8e/src/windows_1258.c b/lib/tutf8e/src/windows_1258.c
@@ -29,6 +29,11 @@ int tutf8e_string_encode_windows_1258(char *output, size_t olen, const char *inp
   return tutf8e_buffer_encode(windows_1258_utf8, input, len, output, &olen);
 }
 
+int tutf8e_buffer_length_windows_1258(const char *i, size_t ilen, size_t *length)
+{
+  return tutf8e_buffer_length(windows_1258_utf8, i, ilen, length);
+}
+
 int tutf8e_buffer_encode_windows_1258(char *output, size_t *olen, const char *input, size_t ilen)
 {
   return tutf8e_buffer_encode(windows_1258_utf8, input, ilen, output, olen);
diff --git a/plugins/filter_modify/modify.c b/plugins/filter_modify/modify.c
@@ -1183,14 +1183,40 @@ static inline int apply_rule_UTF8(msgpack_packer * packer,
             msgpack_pack_object(packer, map->via.map.ptr[i].key);
             if (map->via.map.ptr[i].val.type == MSGPACK_OBJECT_STR &&
                 kv_key_matches_str_rule_key(&map->via.map.ptr[i], rule)) {
-                size_t size = 512;
-                char buffer[512];
-                if (!tutf8e_buffer_encode_iso_8859_2(buffer, &size, map->via.map.ptr[i].val.via.str.ptr, map->via.map.ptr[i].val.via.str.size))
+                size_t size = 0;
+                if (!tutf8e_buffer_length_iso_8859_2(map->via.map.ptr[i].val.via.str.ptr, map->via.map.ptr[i].val.via.str.size, &size) && size)
                 {
-                    helper_pack_string(packer, buffer, size);
-                    ret = FLB_FILTER_MODIFIED;
-                    continue;
+                    const size_t TUTF8_DEFAULT_BUFFER = 256;
+
+                    /* Already UTF8 encoded? */
+                    if (size == map->via.map.ptr[i].val.via.str.size) {
+                    }
+                    /* Small enough for encoding to stack? */
+                    else if (size<=TUTF8_DEFAULT_BUFFER)
+                    {
+                        size = TUTF8_DEFAULT_BUFFER;
+                        char buffer[TUTF8_DEFAULT_BUFFER];
+                        if (!tutf8e_buffer_encode_iso_8859_2(buffer, &size, map->via.map.ptr[i].val.via.str.ptr, map->via.map.ptr[i].val.via.str.size))
+                        {
+                            helper_pack_string(packer, buffer, size);
+                            ret = FLB_FILTER_MODIFIED;
+                            continue;
+                        }
+                    }
+                    /* malloc/free the encoded copy */
+                    else {
+                        char *buffer = (char *) flb_malloc(size);
+                        if (buffer && !tutf8e_buffer_encode_iso_8859_2(buffer, &size, map->via.map.ptr[i].val.via.str.ptr, map->via.map.ptr[i].val.via.str.size))
+                        {
+                            helper_pack_string(packer, buffer, size);
+                            free(buffer);
+                            ret = FLB_FILTER_MODIFIED;
+                            continue;
+                        }                        
+                        free(buffer);
+                    }
                 }
+
             }
             msgpack_pack_object(packer, map->via.map.ptr[i].val);
         }

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,11 @@ int tutf8e_string_encode_iso_8859_1(char output, size_t olen, const char input`
`29`	`29`	`return tutf8e_buffer_encode(iso_8859_1_utf8, input, len, output, &olen);`
`30`	`30`	`}`
`31`	`31`
	`32`	`+int tutf8e_buffer_length_iso_8859_1(const char i, size_t ilen, size_t length)`
	`33`	`+{`
	`34`	`+ return tutf8e_buffer_length(iso_8859_1_utf8, i, ilen, length);`
	`35`	`+}`
	`36`	`+`
`32`	`37`	`int tutf8e_buffer_encode_iso_8859_1(char output, size_t olen, const char *input, size_t ilen)`
`33`	`38`	`{`
`34`	`39`	`return tutf8e_buffer_encode(iso_8859_1_utf8, input, ilen, output, olen);`