aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-04-10 18:44:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-10 18:44:50 +0000
commit6d1ec38a9af32db354e2873b6f19f09e46948f31 (patch)
treec07bb44e21f5839d4f89e538496c858710b53c90
parent532fb7dea76abad7f0a035bf1634c373d7f04190 (diff)
parente8a2ca2708fd28dd847f01a2352c76220bf09da8 (diff)
downloadstlport-6d1ec38a9af32db354e2873b6f19f09e46948f31.tar.gz
am e8a2ca27: am 3b79d03b: Merge "stlport: Fix boundary condition in stlport for __get_integer."
* commit 'e8a2ca2708fd28dd847f01a2352c76220bf09da8': stlport: Fix boundary condition in stlport for __get_integer.
-rw-r--r--stlport/stl/_num_get.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/stlport/stl/_num_get.c b/stlport/stl/_num_get.c
index 1e7d234..e814879 100644
--- a/stlport/stl/_num_get.c
+++ b/stlport/stl/_num_get.c
@@ -155,6 +155,9 @@ __get_integer(_InputIter& __first, _InputIter& __last,
}
}
+ if ((__result == (numeric_limits<_Integer>::min)()) && !__is_negative)
+ __ovflow = true;
+
if (__is_group && __group_sizes_end != __group_sizes) {
*__group_sizes_end++ = __current_group_size;
}