charconv: Fix the slow-path character conversions

[ira/wip.git] / source3 / lib / charcnv.c

diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index f95442a49f76fe965d49ee5bf4221d0baf393b6b..77e359d36298505af3237ead41e84c7ca36e5240 100644 (file)
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -187,7 +187,7 @@ size_t convert_string_error(charset_t from, charset_t to,
 #else
                                size_t ret = convert_string_internal(from, to, p, slen, q, dlen, converted_size);
                                if (converted_size) {
-                                       *converted_size = ret + retval;
+                                       *converted_size += retval;
                                }
                                return ret;
 #endif
@@ -231,7 +231,7 @@ size_t convert_string_error(charset_t from, charset_t to,
 #else
                                size_t ret = convert_string_internal(from, to, p, slen, q, dlen, converted_size);
                                if (converted_size) {
-                                       *converted_size = ret + retval;
+                                       *converted_size += retval;
                                }
                                return ret;
 #endif
@@ -275,7 +275,7 @@ size_t convert_string_error(charset_t from, charset_t to,
 #else
                                size_t ret = convert_string_internal(from, to, p, slen, q, dlen, converted_size);
                                if (converted_size) {
-                                       *converted_size = ret + retval;
+                                       *converted_size += retval;
                                }
                                return ret;
 #endif