You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
48 lines
1.5 KiB
48 lines
1.5 KiB
7 years ago
|
From: Pali <pali@cpan.org>
|
||
|
Date: Fri, 24 Feb 2017 19:51:36 +0100
|
||
|
Subject: [PATCH] Fix type conversions
|
||
|
|
||
|
Calling SvNV() for magical scalar is not enough for float type conversion.
|
||
|
It caused problem for Amavis in tainted mode -- all float values were zero.
|
||
|
On the other hand SvIV() and SvUV() seems to work fine. To be sure that
|
||
|
correct value of float is in scalar use sv_setnv() with explicit NV float
|
||
|
value. Similar code is changed also for integers IV/UV.
|
||
|
|
||
|
This patch should fix reported Amavis bug:
|
||
|
https://github.com/perl5-dbi/DBD-mysql/issues/78
|
||
|
|
||
|
See also reported perl bug about SvNV():
|
||
|
https://rt.perl.org/Public/Bug/Display.html?id=130801
|
||
|
|
||
|
Bugs: https://github.com/perl5-dbi/DBD-mysql/issues/78
|
||
|
Bugs-Debian: https://bugs.debian.org/856064
|
||
|
|
||
|
--- a/dbdimp.c
|
||
|
+++ b/dbdimp.c
|
||
|
@@ -4250,8 +4250,7 @@
|
||
|
switch (mysql_to_perl_type(fields[i].type)) {
|
||
|
case MYSQL_TYPE_DOUBLE:
|
||
|
/* Coerce to dobule and set scalar as NV */
|
||
|
- (void) SvNV(sv);
|
||
|
- SvNOK_only(sv);
|
||
|
+ sv_setnv(sv, SvNV(sv));
|
||
|
break;
|
||
|
|
||
|
case MYSQL_TYPE_LONG:
|
||
|
@@ -4259,13 +4258,11 @@
|
||
|
/* Coerce to integer and set scalar as UV resp. IV */
|
||
|
if (fields[i].flags & UNSIGNED_FLAG)
|
||
|
{
|
||
|
- (void) SvUV(sv);
|
||
|
- SvIOK_only_UV(sv);
|
||
|
+ sv_setuv(sv, SvUV(sv));
|
||
|
}
|
||
|
else
|
||
|
{
|
||
|
- (void) SvIV(sv);
|
||
|
- SvIOK_only(sv);
|
||
|
+ sv_setiv(sv, SvIV(sv));
|
||
|
}
|
||
|
break;
|
||
|
|