jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

check ranges in perlprimtype.swg more carefully to avoid clang warnings

Browse source
This commit is contained in:
Robert Stone 2015-08-08 11:33:32 -07:00
commit 9d19640141
1 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Lib/perl5/perlprimtypes.swg
View file

@ -37,7 +37,7 @@ SWIGINTERNINLINE SV *
SWIG_From_dec(long)(long value) SWIG_From_dec(long)(long value)
{ {
SV *sv; SV *sv;
if (value >= IV_MIN && value <= IV_MAX) if (IVSIZE >= sizeof(value) || (value >= IV_MIN && value <= IV_MAX))
sv = newSViv(value); sv = newSViv(value);
else else
sv = newSVpvf("%ld", value); sv = newSVpvf("%ld", value);
@ -46,20 +46,22 @@ SWIG_From_dec(long)(long value)
} }
%fragment(SWIG_AsVal_frag(long),"header", %fragment(SWIG_AsVal_frag(long),"header",
fragment="<limits.h>",
fragment="<stdlib.h>",
fragment="SWIG_CanCastAsInteger") { fragment="SWIG_CanCastAsInteger") {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_dec(long)(SV *obj, long* val) SWIG_AsVal_dec(long)(SV *obj, long* val)
{ {
if (SvUOK(obj)) { if (SvUOK(obj)) {
UV v = SvUV(obj); UV v = SvUV(obj);
if (v <= LONG_MAX) { if (UVSIZE < sizeof(*val) || v <= LONG_MAX) {
if (val) *val = v; if (val) *val = v;
return SWIG_OK; return SWIG_OK;
} }
return SWIG_OverflowError; return SWIG_OverflowError;
} else if (SvIOK(obj)) { } else if (SvIOK(obj)) {
IV v = SvIV(obj); IV v = SvIV(obj);
if (v >= LONG_MIN && v <= LONG_MAX) { if (IVSIZE <= sizeof(*val) || (v >= LONG_MIN && v <= LONG_MAX)) {
if(val) *val = v; if(val) *val = v;
return SWIG_OK; return SWIG_OK;
} }
@ -102,7 +104,7 @@ SWIGINTERNINLINE SV *
SWIG_From_dec(unsigned long)(unsigned long value) SWIG_From_dec(unsigned long)(unsigned long value)
{ {
SV *sv; SV *sv;
if (value <= UV_MAX) if (UVSIZE >= sizeof(value) || value <= UV_MAX)
sv = newSVuv(value); sv = newSVuv(value);
else else
sv = newSVpvf("%lu", value); sv = newSVpvf("%lu", value);
@ -111,20 +113,22 @@ SWIG_From_dec(unsigned long)(unsigned long value)
} }
%fragment(SWIG_AsVal_frag(unsigned long),"header", %fragment(SWIG_AsVal_frag(unsigned long),"header",
fragment="<limits.h>",
fragment="<stdlib.h>",
fragment="SWIG_CanCastAsInteger") { fragment="SWIG_CanCastAsInteger") {
SWIGINTERN int SWIGINTERN int
SWIG_AsVal_dec(unsigned long)(SV *obj, unsigned long *val) SWIG_AsVal_dec(unsigned long)(SV *obj, unsigned long *val)
{ {
if (SvUOK(obj)) { if (SvUOK(obj)) {
UV v = SvUV(obj); UV v = SvUV(obj);
if (v <= ULONG_MAX) { if (UVSIZE <= sizeof(*val) || v <= ULONG_MAX) {
if (val) *val = v; if (val) *val = v;
return SWIG_OK; return SWIG_OK;
} }
return SWIG_OverflowError; return SWIG_OverflowError;
} else if (SvIOK(obj)) { } else if (SvIOK(obj)) {
IV v = SvIV(obj); IV v = SvIV(obj);
if (v >= 0 && v <= ULONG_MAX) { if (v >= 0 && (IVSIZE <= sizeof(*val) || v <= ULONG_MAX)) {
if (val) *val = v; if (val) *val = v;
return SWIG_OK; return SWIG_OK;
} }
@ -164,13 +168,12 @@ SWIG_AsVal_dec(unsigned long)(SV *obj, unsigned long *val)
%fragment(SWIG_From_frag(long long),"header", %fragment(SWIG_From_frag(long long),"header",
fragment=SWIG_From_frag(long), fragment=SWIG_From_frag(long),
fragment="<limits.h>",
fragment="<stdio.h>") { fragment="<stdio.h>") {
SWIGINTERNINLINE SV * SWIGINTERNINLINE SV *
SWIG_From_dec(long long)(long long value) SWIG_From_dec(long long)(long long value)
{ {
SV *sv; SV *sv;
if (value >= IV_MIN && value <= IV_MAX) if (IVSIZE >= sizeof(value) || (value >= IV_MIN && value <= IV_MAX))
sv = newSViv((IV)(value)); sv = newSViv((IV)(value));
else { else {
//sv = newSVpvf("%lld", value); doesn't work in non 64bit Perl //sv = newSVpvf("%lld", value); doesn't work in non 64bit Perl
@ -192,14 +195,15 @@ SWIG_AsVal_dec(long long)(SV *obj, long long *val)
{ {
if (SvUOK(obj)) { if (SvUOK(obj)) {
UV v = SvUV(obj); UV v = SvUV(obj);
if (v < LLONG_MAX) { /* pretty sure this could allow v == LLONG MAX */
if (UVSIZE < sizeof(*val) || v < LLONG_MAX) {
if (val) *val = v; if (val) *val = v;
return SWIG_OK; return SWIG_OK;
} }
return SWIG_OverflowError; return SWIG_OverflowError;
} else if (SvIOK(obj)) { } else if (SvIOK(obj)) {
IV v = SvIV(obj); IV v = SvIV(obj);
if (v >= LLONG_MIN && v <= LLONG_MAX) { if (IVSIZE <= sizeof(*val) || (v >= LLONG_MIN && v <= LLONG_MAX)) {
if (val) *val = v; if (val) *val = v;
return SWIG_OK; return SWIG_OK;
} }
@ -241,13 +245,12 @@ SWIG_AsVal_dec(long long)(SV *obj, long long *val)
%fragment(SWIG_From_frag(unsigned long long),"header", %fragment(SWIG_From_frag(unsigned long long),"header",
fragment=SWIG_From_frag(long long), fragment=SWIG_From_frag(long long),
fragment="<limits.h>",
fragment="<stdio.h>") { fragment="<stdio.h>") {
SWIGINTERNINLINE SV * SWIGINTERNINLINE SV *
SWIG_From_dec(unsigned long long)(unsigned long long value) SWIG_From_dec(unsigned long long)(unsigned long long value)
{ {
SV *sv; SV *sv;
if (value <= UV_MAX) if (UVSIZE >= sizeof(value) || value <= UV_MAX)
sv = newSVuv((UV)(value)); sv = newSVuv((UV)(value));
else { else {
//sv = newSVpvf("%llu", value); doesn't work in non 64bit Perl //sv = newSVpvf("%llu", value); doesn't work in non 64bit Perl
@ -267,11 +270,13 @@ SWIGINTERN int
SWIG_AsVal_dec(unsigned long long)(SV *obj, unsigned long long *val) SWIG_AsVal_dec(unsigned long long)(SV *obj, unsigned long long *val)
{ {
if (SvUOK(obj)) { if (SvUOK(obj)) {
/* pretty sure this should be conditional on
* (UVSIZE <= sizeof(*val) || v <= ULLONG_MAX) */
if (val) *val = SvUV(obj); if (val) *val = SvUV(obj);
return SWIG_OK; return SWIG_OK;
} else if (SvIOK(obj)) { } else if (SvIOK(obj)) {
IV v = SvIV(obj); IV v = SvIV(obj);
if (v >= 0 && v <= ULLONG_MAX) { if (v >= 0 && (IVSIZE <= sizeof(*val) || v <= ULLONG_MAX)) {
if (val) *val = v; if (val) *val = v;
return SWIG_OK; return SWIG_OK;
} else { } else {