[PATCH] gdi32/tests: Check array index limit first.

[Andrey Gusev]

Signed-off-by: Andrey Gusev 
---
 dlls/gdi32/tests/font.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 6243a6d339..2b214a07aa 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -202,7 +202,7 @@ static void check_font(const char* test, const LOGFONTA* lf, HFONT hfont)

ret = GetObjectA(hfont, sizeof(getobj_lf), &getobj_lf);
     /* NT4 tries to be clever and only returns the minimum length */
-    while (lf->lfFaceName[minlen] && minlen < LF_FACESIZE-1)
+    while (minlen < LF_FACESIZE-1 && lf->lfFaceName[minlen])
         minlen++;
     minlen += FIELD_OFFSET(LOGFONTA, lfFaceName) + 1;
     ok(ret == sizeof(LOGFONTA) || ret == minlen, "%s: GetObject returned %d\n", test, ret);

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?
Full results can be found at
https://testbot.winehq.org/JobDetails.pl?Key=38325

Your paranoid android.

=== wvistau64_zh_CN (32 bit font) ===
font.c:6257: Test failed: 4(5): expected height 15, got 13
font.c:6260: Test failed: 4(5): expected lfHeight -12, got -11
font.c:1292: Test failed: GetCharABCWidthsA 100 - 100 should have failed
font.c:1292: Test failed: GetCharABCWidthsA ffff - ffff should have failed
font.c:1298: Test failed: GetCharABCWidthsA ff should match. codepage = 0
font.c:1298: Test failed: GetCharABCWidthsA ff should match. codepage = 134
font.c:5514: Test failed: font family names don't match: returned MingLiU, expect ŒšÃ÷ów
font.c:5525: Test failed: MingLiU: font face names don't match: returned MingLiU, expect ŒšÃ÷ów
font.c:5546: Test failed: MingLiU: UNIQUE ID (full name) doesn't match: returned MingLiU, expect ŒšÃ÷ów
font.c:5514: Test failed: font family names don't match: returned MingLiU, expect ŒšÃ÷ów
font.c:5525: Test failed: MingLiU: font face names don't match: returned MingLiU, expect ŒšÃ÷ów
font.c:5546: Test failed: MingLiU: UNIQUE ID (full name) doesn't match: returned MingLiU, expect ŒšÃ÷ów
font.c:5514: Test failed: font family names don't match: returned PMingLiU, expect ÐÂŒšÃ÷ów
font.c:5525: Test failed: PMingLiU: font face names don't match: returned PMingLiU, expect ÐÂŒšÃ÷ów
font.c:5546: Test failed: PMingLiU: UNIQUE ID (full name) doesn't match: returned PMingLiU, expect ÐÂŒšÃ÷ów
font.c:5514: Test failed: font family names don't match: returned PMingLiU, expect ÐÂŒšÃ÷ów
font.c:5525: Test failed: PMingLiU: font face names don't match: returned PMingLiU, expect ÐÂŒšÃ÷ów
font.c:5546: Test failed: PMingLiU: UNIQUE ID (full name) doesn't match: returned PMingLiU, expect ÐÂŒšÃ÷ów
font.c:5514: Test failed: font family names don't match: returned @MingLiU, expect @ŒšÃ÷ów
font.c:5525: Test failed: @MingLiU: font face names don't match: returned @MingLiU, expect @ŒšÃ÷ów
font.c:5546: Test failed: @MingLiU: UNIQUE ID (full name) doesn't match: returned MingLiU, expect ŒšÃ÷ów
font.c:5514: Test failed: font family names don't match: returned @MingLiU, expect @ŒšÃ÷ów
font.c:5525: Test failed: @MingLiU: font face names don't match: returned @MingLiU, expect @ŒšÃ÷ów
font.c:5546: Test failed: @MingLiU: UNIQUE ID (full name) doesn't match: returned MingLiU, expect ŒšÃ÷ów
font.c:5514: Test failed: font family names don't match: returned @PMingLiU, expect @ÐÂŒšÃ÷ów
font.c:5525: Test failed: @PMingLiU: font face names don't match: returned @PMingLiU, expect @ÐÂŒšÃ÷ów
font.c:5546: Test failed: @PMingLiU: UNIQUE ID (full name) doesn't match: returned PMingLiU, expect ÐÂŒšÃ÷ów
font.c:5514: Test failed: font family names don't match: returned @PMingLiU, expect @ÐÂŒšÃ÷ów
font.c:5525: Test failed: @PMingLiU: font face names don't match: returned @PMingLiU, expect @ÐÂŒšÃ÷ów
font.c:5546: Test failed: @PMingLiU: UNIQUE ID (full name) doesn't match: returned PMingLiU, expect ÐÂŒšÃ÷ów

[Huw Davies]

On Fri, May 11, 2018 at 07:57:37PM +0300, Andrey Gusev wrote:
> Signed-off-by: Andrey Gusev
>
> dlls/gdi32/tests/font.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
> index 6243a6d339..2b214a07aa 100644
> --- a/dlls/gdi32/tests/font.c
> +++ b/dlls/gdi32/tests/font.c
> @@ -202,7 +202,7 @@ static void check_font(const char* test, const LOGFONTA* lf, HFONT hfont)
>  ret = GetObjectA(hfont, sizeof(getobj_lf), &getobj_lf);
>  /* NT4 tries to be clever and only returns the minimum length */
> - while (lf->lfFaceName[minlen] && minlen < LF_FACESIZE-1)
> - while (minlen < LF_FACESIZE-1 && lf->lfFaceName[minlen])
>     minlen++;
> minlen += FIELD_OFFSET(LOGFONTA, lfFaceName) + 1;
> ok(ret == sizeof(LOGFONTA) || ret == minlen, "%s: GetObject returned %d\n", test, ret);

Actually this workaround for NT4 could be removed completely, along
with other workarounds, further down in the function, for win9x.

Huw.