Marcus Meissner : shlwapi: Fixed bad pointer arithmentic by removing sizeof () (Coverity).

[Alexandre Julliard]

Module: wine
Branch: master
Commit: c9b6994648c3cce9d3e590cf6406852471834911
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c9b6994648c3cce9d3e590cf64...

Author: Marcus Meissner <meissner(a)suse.de>
Date:   Tue Oct 18 05:50:26 2011 +0200

shlwapi: Fixed bad pointer arithmentic by removing sizeof() (Coverity).

---

 dlls/shlwapi/url.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
index bcd413c..d43bea5 100644
--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -744,7 +744,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
 
             if (base.nScheme == URL_SCHEME_HTTP || base.nScheme == URL_SCHEME_HTTPS)
                 manual_search = TRUE;
-            else if (work - base.pszSuffix > len_htmW * sizeof(WCHAR)) {
+            else if (work - base.pszSuffix > len_htmW) {
                 work -= len_htmW;
                 if (strncmpiW(work, htmW, len_htmW) == 0)
                     manual_search = TRUE;
@@ -752,7 +752,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
             }
 
             if (!manual_search &&
-                    work - base.pszSuffix > len_htmlW * sizeof(WCHAR)) {
+                    work - base.pszSuffix > len_htmlW) {
                 work -= len_htmlW;
                 if (strncmpiW(work, htmlW, len_htmlW) == 0)
                     manual_search = TRUE;