summaryrefslogtreecommitdiffstats
path: root/libcxx/src
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2015-03-23 20:07:17 +0000
committerMarshall Clow <mclow.lists@gmail.com>2015-03-23 20:07:17 +0000
commitc5a996f111037e637ca3bd837556018d94cf9226 (patch)
tree54cce378d3afa805446ae7edc4b7453b306ec644 /libcxx/src
parent6a7ee6f460892dd7993979f02b7a604f2998759b (diff)
downloadbcm5719-llvm-c5a996f111037e637ca3bd837556018d94cf9226.tar.gz
bcm5719-llvm-c5a996f111037e637ca3bd837556018d94cf9226.zip
Fix incorrect error handling of call to mbrtowc. This is PR#13759. Leaving the bug open because (1) I'm not sure that we're correct here, only better than before, and (2) no tests
llvm-svn: 233012
Diffstat (limited to 'libcxx/src')
-rw-r--r--libcxx/src/locale.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp
index 54a24e68c57..2842bfccb77 100644
--- a/libcxx/src/locale.cpp
+++ b/libcxx/src/locale.cpp
@@ -1657,7 +1657,7 @@ codecvt<wchar_t, char, mbstate_t>::do_in(state_type& st,
frm_nxt = frm;
return frm_nxt == frm_end ? ok : partial;
}
- if (n == 0)
+ if (n == (size_t)-1)
return error;
to_nxt += n;
if (to_nxt == to_end)
OpenPOWER on IntegriCloud