In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/7f974d7e9e13f5929bc0cfa52101160692c2d394?hp=4bf31405101ba885e9cddbf63b64e9b298992509>
- Log ----------------------------------------------------------------- commit 7f974d7e9e13f5929bc0cfa52101160692c2d394 Author: Karl Williamson <[email protected]> Date: Wed Jan 25 22:19:55 2017 -0700 Fix embed.fnc for utf8_to_uvchr_buf ----------------------------------------------------------------------- Summary of changes: embed.fnc | 2 +- proto.h | 4 +++- utf8.c | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/embed.fnc b/embed.fnc index 475d86a924..1b05dd072f 100644 --- a/embed.fnc +++ b/embed.fnc @@ -1799,7 +1799,7 @@ ApMd |U8* |bytes_to_utf8 |NN const U8 *s|NN STRLEN *len ApdD |UV |utf8_to_uvchr |NN const U8 *s|NULLOK STRLEN *retlen ApdD |UV |utf8_to_uvuni |NN const U8 *s|NULLOK STRLEN *retlen ApMD |UV |valid_utf8_to_uvuni |NN const U8 *s|NULLOK STRLEN *retlen -Amd |UV |utf8_to_uvchr_buf |NN const U8 *s|NN const U8 *send|NULLOK STRLEN *retlen +Aopd |UV |utf8_to_uvchr_buf |NN const U8 *s|NN const U8 *send|NULLOK STRLEN *retlen ApdD |UV |utf8_to_uvuni_buf |NN const U8 *s|NN const U8 *send|NULLOK STRLEN *retlen pM |bool |check_utf8_print |NN const U8 *s|const STRLEN len diff --git a/proto.h b/proto.h index 516888cb94..007bff78ec 100644 --- a/proto.h +++ b/proto.h @@ -3548,7 +3548,9 @@ PERL_CALLCONV UV Perl_utf8_to_uvchr(pTHX_ const U8 *s, STRLEN *retlen) #define PERL_ARGS_ASSERT_UTF8_TO_UVCHR \ assert(s) -/* PERL_CALLCONV UV utf8_to_uvchr_buf(pTHX_ const U8 *s, const U8 *send, STRLEN *retlen); */ +PERL_CALLCONV UV Perl_utf8_to_uvchr_buf(pTHX_ const U8 *s, const U8 *send, STRLEN *retlen); +#define PERL_ARGS_ASSERT_UTF8_TO_UVCHR_BUF \ + assert(s); assert(send) PERL_CALLCONV UV Perl_utf8_to_uvuni(pTHX_ const U8 *s, STRLEN *retlen) __attribute__deprecated__; #define PERL_ARGS_ASSERT_UTF8_TO_UVUNI \ diff --git a/utf8.c b/utf8.c index 77e16f3fd9..c523f324d7 100644 --- a/utf8.c +++ b/utf8.c @@ -1748,6 +1748,8 @@ Also implemented as a macro in utf8.h UV Perl_utf8_to_uvchr_buf(pTHX_ const U8 *s, const U8 *send, STRLEN *retlen) { + PERL_ARGS_ASSERT_UTF8_TO_UVCHR_BUF; + assert(s < send); return utf8n_to_uvchr(s, send - s, retlen, -- Perl5 Master Repository
