From: Jarkko Hietaniemi Date: Sat, 1 Dec 2001 18:43:11 +0000 (+0000) Subject: Try to protect against wild langinfo() arguments. X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b27961e54c1afdd795823ec3e61ccca0718baf23;p=p5sagit%2Fp5-mst-13.2.git Try to protect against wild langinfo() arguments. p4raw-id: //depot/perl@13410 --- diff --git a/ext/I18N/Langinfo/Langinfo.xs b/ext/I18N/Langinfo/Langinfo.xs index d335eec..314e891 100644 --- a/ext/I18N/Langinfo/Langinfo.xs +++ b/ext/I18N/Langinfo/Langinfo.xs @@ -19,8 +19,32 @@ langinfo(code) int code CODE: #ifdef HAS_NL_LANGINFO - char *s = nl_langinfo(code); - RETVAL = newSVpvn(s, strlen(s)); + char *s; + if (code) { /* bold assumption: all valid langinfo codes > 0 */ +#ifdef _MAXSTRMSG + if (code >= _MAXSTRMSG + RETVAL = &PL_sv_undef; + else +#else +# ifdef _NL_NUM_ITEMS + if (code >= _NL_NUM_ITEMS) + RETVAL = &PL_sv_undef; + else +# else +# ifdef _NL_NUM + if (code >= _NL_NUM) + RETVAL = &PL_sv_undef; + else +# endif +# endif +#endif + { + s = nl_langinfo(code); + RETVAL = newSVpvn(s, strlen(s)); + } + } else { + RETVAL = &PL_sv_undef; + } #else croak("nl_langinfo() not implemented on this architecture"); #endif