CVE-2015-5330: Fix handling of unicode near string endings

[samba.git] / lib / util / charset / charset.h

diff --git a/lib/util/charset/charset.h b/lib/util/charset/charset.h
index e4297e4f3ce92814c324e4635e13a3ca5641e788..060f1cf56f735c8e6d6be199f5c586e757cdf681 100644 (file)
--- a/lib/util/charset/charset.h
+++ b/lib/util/charset/charset.h
@@ -171,15 +171,16 @@ smb_iconv_t get_conv_handle(struct smb_iconv_handle *ic,
                            charset_t from, charset_t to);
 const char *charset_name(struct smb_iconv_handle *ic, charset_t ch);
 
-codepoint_t next_codepoint_ext(const char *str, charset_t src_charset,
-                              size_t *size);
+codepoint_t next_codepoint_ext(const char *str, size_t len,
+                              charset_t src_charset, size_t *size);
 codepoint_t next_codepoint(const char *str, size_t *size);
 ssize_t push_codepoint(char *str, codepoint_t c);
 
 /* codepoints */
 codepoint_t next_codepoint_handle_ext(struct smb_iconv_handle *ic,
-                           const char *str, charset_t src_charset,
-                           size_t *size);
+                                     const char *str, size_t len,
+                                     charset_t src_charset,
+                                     size_t *size);
 codepoint_t next_codepoint_handle(struct smb_iconv_handle *ic,
                            const char *str, size_t *size);
 ssize_t push_codepoint_handle(struct smb_iconv_handle *ic,