[PATCH 0/1] MR8345: Draft: windows.web/tests: Fix checking of non-null terminated json.

[Yuxuan Shui (＠yshui)]

check_json_ uses wcslen on the passed json string, which is no good for
non-null terminated ones. It should have a length parameter.

* * *

(made a draft since i am not sure what this test is meant to test, see comment.)

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8345

[PATCH 1/1] windows.web/tests: Fix checking of non-null terminated json.

[Yuxuan Shui]

From: Yuxuan Shui <yshui(a)codeweavers.com>

check_json_ uses wcslen on the passed json string, which is no good for
non-null terminated ones. It should have a length parameter.
---
 dlls/windows.web/tests/web.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dlls/windows.web/tests/web.c b/dlls/windows.web/tests/web.c
index b0f38edfb3b..2e4b5d0e9dc 100644
--- a/dlls/windows.web/tests/web.c
+++ b/dlls/windows.web/tests/web.c
@@ -90,8 +90,10 @@ static void test_JsonObjectStatics(void)
     ok( ref == 1, "got ref %ld.\n", ref );
 }
 
-#define check_json( json_value_statics, json, expected_json_value_type, valid ) check_json_( __LINE__, json_value_statics, json, expected_json_value_type, valid )
-static void check_json_( unsigned int line, IJsonValueStatics *json_value_statics, const WCHAR *json, JsonValueType expected_json_value_type, boolean valid )
+#define check_json( json_value_statics, json, expected_json_value_type, valid ) \
+    check_json_( __LINE__, json_value_statics, json, wcslen( json ), expected_json_value_type, valid )
+static void check_json_( unsigned int line, IJsonValueStatics *json_value_statics, const WCHAR *json, SIZE_T json_len,
+                         JsonValueType expected_json_value_type, boolean valid )
 {
     HSTRING str = NULL, parsed_str = NULL, empty_space = NULL;
     IJsonObject *json_object = (void *)0xdeadbeef;
@@ -104,7 +106,7 @@ static void check_json_( unsigned int line, IJsonValueStatics *json_value_static
     LONG ref;
     int res;
 
-    hr = WindowsCreateString( json, wcslen( json ), &str );
+    hr = WindowsCreateString( json, json_len, &str );
     ok_(__FILE__, line)( hr == S_OK, "got hr %#lx.\n", hr );
     hr = IJsonValueStatics_Parse( json_value_statics, str, &json_value );
     if (!valid)
@@ -225,7 +227,7 @@ WCHAR *create_non_null_terminated( const WCHAR *str )
 static void check_non_null_terminated_json_( unsigned int line, IJsonValueStatics *json_value_statics, const WCHAR *json, JsonValueType expected_json_value_type )
 {
     WCHAR *str = create_non_null_terminated( json );
-    check_json_( line, json_value_statics, str, expected_json_value_type, FALSE );
+    check_json_( line, json_value_statics, str, wcslen( json ), expected_json_value_type, FALSE );
     free( str );
 }
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8345

[Yuxuan Shui (＠yshui)]

I think this might actually be checking how garbage after the json string is handled? In that case we should do that explicitly and not rely on random data in the memory.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8345#note_106854

[Yuxuan Shui (＠yshui)]

On Tue Jun 17 15:44:35 2025 +0000, Yuxuan Shui wrote:
> I think this might actually be checking how garbage after the json
> string is handled? In that case we should do that explicitly and not
> rely on random data in the memory.
> cc @maljaf

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8345#note_106859

[Mohamad Al-Jaf (＠maljaf)]

On Tue Jun 17 15:44:35 2025 +0000, Yuxuan Shui wrote:
> cc @maljaf
> It's checking how Windows handles strings that are non-null terminated so it should indeed have a length parameter. The Wine implementation will need to be updated accordingly or the tests marked as todo_wine or removed entirely.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8345#note_107616