Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / icu / source / common / propsvec.c

diff --git a/src/third_party/icu/source/common/propsvec.c b/src/third_party/icu/source/common/propsvec.c
index 705e40f..f91a155 100644 (file)
--- a/src/third_party/icu/source/common/propsvec.c
+++ b/src/third_party/icu/source/common/propsvec.c
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
-*   Copyright (C) 2002-2010, International Business Machines
+*   Copyright (C) 2002-2011, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -23,6 +23,7 @@
 #include "utrie2.h"
 #include "uarrsort.h"
 #include "propsvec.h"
+#include "uassert.h"
 
 struct UPropsVectors {
     uint32_t *v;
@@ -91,10 +92,10 @@ upvec_close(UPropsVectors *pv) {
 static uint32_t *
 _findRow(UPropsVectors *pv, UChar32 rangeStart) {
     uint32_t *row;
-    int32_t columns, i, start, limit, prevRow, rows;
+    int32_t columns, i, start, limit, prevRow;
 
     columns=pv->columns;
-    rows=limit=pv->rows;
+    limit=pv->rows;
     prevRow=pv->prevRow;
 
     /* check the vicinity of the last-seen row (start searching with an unrolled loop) */
@@ -352,6 +353,7 @@ upvec_compact(UPropsVectors *pv, UPVecCompactHandler *handler, void *context, UE
 
     rows=pv->rows;
     columns=pv->columns;
+    U_ASSERT(columns>=3); /* upvec_open asserts this */
     valueColumns=columns-2; /* not counting start & limit */
 
     /* sort the properties vectors to find unique vector values */