[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

Alexandre Julliard julliard at winehq.org
Sun Jun 17 20:02:31 UTC 2012

The following commit has been merged in the wheezy branch:
commit 7efee1a2b57004309cb8cfa96cd44666bf1478eb
Author: Aric Stewart <aric at codeweavers.com>
Date:   Mon Mar 19 13:48:39 2012 -0500

    usp10: Properly handle invalid arguments to ScriptBreak.
    (cherry picked from commit 5bb7590fadcba0d308870ddfa58fc43739a32112)

diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index cad234f..4d0d9f3 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -2665,7 +2665,8 @@ HRESULT WINAPI ScriptBreak(const WCHAR *chars, int count, const SCRIPT_ANALYSIS
     TRACE("(%s, %d, %p, %p)\n", debugstr_wn(chars, count), count, sa, la);
-    if (!la) return S_FALSE;
+    if (count < 0 || !la) return E_INVALIDARG;
+    if (count == 0) return E_FAIL;
     BREAK_line(chars, count, sa, la);

Debian Wine packaging

More information about the pkg-wine-party mailing list