+captive_validate_ucs2_fixlen()

+captive_validate_UnicodeString_noterm()

diff --git a/src/libcaptive/include/captive/unicode.h b/src/libcaptive/include/captive/unicode.h
index 52df30d..6f26404 100644 (file)
--- a/src/libcaptive/include/captive/unicode.h
+++ b/src/libcaptive/include/captive/unicode.h
@@ -74,9 +74,11 @@ void _captive_utf8_to_UnicodeString_alloca_internal_fill(UNICODE_STRING *mem,con
 
 gboolean captive_validate_ucs4(const gunichar *string_ucs4);
 gboolean captive_validate_ucs2(const captive_ucs2 *string_ucs2);
+gboolean captive_validate_ucs2_fixlen(const captive_ucs2 *string_ucs2,glong string_ucs2_fixlen);
 gboolean captive_validate_utf8(const gchar *string_utf8);
 glong captive_ucs2_strlen(const captive_ucs2 *string_ucs2) G_GNUC_PURE;
 gboolean captive_validate_UnicodeString(const UNICODE_STRING *string_UnicodeString);
+gboolean captive_validate_UnicodeString_noterm(const UNICODE_STRING *string_UnicodeString_noterm);
 gboolean captive_validate_AnsiString(const ANSI_STRING *string_AnsiString);
 gchar *captive_UnicodeString_to_utf8_malloc(const UNICODE_STRING *string_UnicodeString);
 PUNICODE_STRING captive_utf8_to_UnicodeString_malloc(const gchar *string_utf8);

diff --git a/src/libcaptive/rtl/unicode.c b/src/libcaptive/rtl/unicode.c
index ede4f1f..b45def4 100644 (file)
--- a/src/libcaptive/rtl/unicode.c
+++ b/src/libcaptive/rtl/unicode.c
@@ -76,32 +76,59 @@ const gunichar *cs_ucs4;
 
 
 /**
- * captive_validate_ucs2:
+ * captive_validate_ucs2_fixlen:
  * @string_ucs2: #const #captive_ucs2 * type string to validate.
  * Invalid string input is forbidden.
  * UTF-16 encoded strings are forbidden.
+ * @string_ucs2_fixlen: Number of characters from @string_ucs2 to check.
+ * captive_ucs2_strlen(@string_ucs2)>=@string_ucs2_fixlen is required.
+ * Negative value is forbidden.
  *
- * Checks the validity of all 16-bit unicharacters of 0-terminated string.
+ * Checks the validity of first @string_ucs2_fixlen 16-bit unicharacters of @string_ucs2.
  * It is required to have characters complying to g_unichar_validate().
+ * String length must be equal or larger than @string_ucs2_fixlen;
  *
  * Returns: %TRUE if the string is valid.
  */ 
-gboolean captive_validate_ucs2(const captive_ucs2 *string_ucs2)
+gboolean captive_validate_ucs2_fixlen(const captive_ucs2 *string_ucs2,glong string_ucs2_fixlen)
 {
 const captive_ucs2 *cs_ucs2;
 
        g_return_val_if_fail(captive_validate_unicode_types(),FALSE);
        g_return_val_if_fail(string_ucs2!=NULL,FALSE);
+       g_return_val_if_fail(string_ucs2_fixlen>=0,FALSE);
 
        /* g_unichar_validate() will reject surrogates (G_UNICODE_SURROGATE) */
-       for (cs_ucs2=string_ucs2;*cs_ucs2;cs_ucs2++)
+       for (cs_ucs2=string_ucs2;cs_ucs2<string_ucs2+string_ucs2_fixlen;cs_ucs2++) {
+               g_return_val_if_fail(*cs_ucs2!=0,FALSE);
                g_return_val_if_fail(g_unichar_validate(*cs_ucs2),FALSE);
+               }
 
        return TRUE;
 }
 
 
 /**
+ * captive_validate_ucs2:
+ * @string_ucs2: #const #captive_ucs2 * type string to validate.
+ * Invalid string input is forbidden.
+ * UTF-16 encoded strings are forbidden.
+ *
+ * Checks the validity of all 16-bit unicharacters of 0-terminated string.
+ * It is required to have characters complying to g_unichar_validate().
+ *
+ * Returns: %TRUE if the string is valid.
+ */ 
+gboolean captive_validate_ucs2(const captive_ucs2 *string_ucs2)
+{
+       g_return_val_if_fail(captive_validate_unicode_types(),FALSE);
+       g_return_val_if_fail(string_ucs2!=NULL,FALSE);
+
+       return captive_validate_ucs2_fixlen(string_ucs2,captive_ucs2_strlen(string_ucs2));
+}
+
+
+/**
  * captive_validate_utf8:
  * @string_utf8: #const #gchar * utf8 type string to validate.
  * Invalid string input is forbidden.
@@ -139,7 +166,9 @@ glong captive_ucs2_strlen(const captive_ucs2 *string_ucs2)
 {
 glong r;
 
-       g_return_val_if_fail(captive_validate_ucs2(string_ucs2),0);
+       /* Do not call captive_validate_ucs2(string_ucs2) as we would be looping! */
+       g_return_val_if_fail(captive_validate_unicode_types(),FALSE);
+       g_return_val_if_fail(string_ucs2!=NULL,FALSE);
 
        for (r=0;*string_ucs2;string_ucs2++)
                r++;
@@ -155,6 +184,7 @@ glong r;
  *
  * Checks the internal consistency of the given @string_UnicodeString.
  * It is required to have characters complying to g_unichar_validate().
+ * @string_UnicodeString MUST be zero-terminated.
  *
  * Returns: %TRUE if the string is valid.
  */
@@ -177,6 +207,42 @@ gboolean captive_validate_UnicodeString(const UNICODE_STRING *string_UnicodeStri
 
 
 /**
+ * captive_validate_UnicodeString_noterm:
+ * @string_UnicodeString_noterm: #PUNICODE_STRING type string to validate.
+ * Invalid string input is forbidden.
+ *
+ * Checks the internal consistency of the given @string_UnicodeString.
+ * It is required to have characters complying to g_unichar_validate().
+ * @string_UnicodeString_noterm does not neet to be zero-terminated.
+ *
+ * Returns: %TRUE if the string is valid.
+ */
+gboolean captive_validate_UnicodeString_noterm(const UNICODE_STRING *string_UnicodeString_noterm)
+{
+const WCHAR *cwp;
+
+       g_return_val_if_fail(captive_validate_unicode_types(),FALSE);
+       g_return_val_if_fail(sizeof(WCHAR)==sizeof(*string_UnicodeString_noterm->Buffer),FALSE);
+       g_return_val_if_fail(string_UnicodeString_noterm!=NULL,FALSE);
+       g_return_val_if_fail(string_UnicodeString_noterm->Length%sizeof(*string_UnicodeString_noterm->Buffer)==0,FALSE);
+       g_return_val_if_fail(string_UnicodeString_noterm->MaximumLength>=string_UnicodeString_noterm->Length,FALSE);
+
+       for (
+                       cwp=string_UnicodeString_noterm->Buffer;
+                       cwp<string_UnicodeString_noterm->Buffer
+                                       +(string_UnicodeString_noterm->Length/sizeof(*string_UnicodeString_noterm->Buffer));
+                       cwp++)
+               g_return_val_if_fail(*cwp!=0,FALSE);
+
+       g_return_val_if_fail(captive_validate_ucs2_fixlen(string_UnicodeString_noterm->Buffer,
+                                       string_UnicodeString_noterm->Length/sizeof(*string_UnicodeString_noterm->Buffer)),
+                       FALSE);
+
+       return TRUE;
+}
+
+
+/**
  * captive_validate_AnsiString:
  * @string_AnsiString: #PANSI_STRING type string to validate.
  * Invalid string input is forbidden.