Nikolay Sivov : comctl32/ipaddress: Use array index after range check ( Coverity).

[Alexandre Julliard]

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

Author: Nikolay Sivov 
Date:   Fri Feb 25 12:01:12 2011 +0300

comctl32/ipaddress: Use array index after range check (Coverity).

---

dlls/comctl32/ipaddress.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c
index 1f41f91..ee8a31d 100644
--- a/dlls/comctl32/ipaddress.c
+++ b/dlls/comctl32/ipaddress.c
@@ -384,15 +384,16 @@ static void IPADDRESS_SetFocusToField (const IPADDRESS_INFO *infoPtr, INT index)

static BOOL IPADDRESS_ConstrainField (const IPADDRESS_INFO *infoPtr, int currentfield)
 {
-    const IPPART_INFO *part = &infoPtr->Part[currentfield];
-    WCHAR field[10];
     static const WCHAR fmt[] = { '%', 'd', 0 };
+    const IPPART_INFO *part;
     int curValue, newValue;
+    WCHAR field[10];

TRACE("(currentfield=%d)\n", currentfield);

if (currentfield < 0 || currentfield > 3) return FALSE;

+    part = &infoPtr->Part[currentfield];
     if (!GetWindowTextW (part->EditHwnd, field, 4)) return FALSE;

curValue = atoiW(field);