mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 20:37:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.5 into 10.6

Browse source
This commit is contained in:
Marko Mäkelä 2024-10-03 09:31:39 +03:00
commit 7e0afb1c73
482 changed files with 4429 additions and 625 deletions
Download patch file Download diff file Expand all files Collapse all files

5
strings/ctype-simple.c
View file

@ -759,7 +759,10 @@ ulonglong my_strntoull_8bit(CHARSET_INFO *cs,
return (~(ulonglong) 0);
}
return (negative ? -((longlong) i) : (longlong) i);
/* Avoid undefinite behavior - negation of LONGLONG_MIN */
return negative && (longlong) i != LONGLONG_MIN ?
-((longlong) i) :
(longlong) i;
noconv:
err[0]= EDOM;

9
strings/ctype-ucs2.c
View file

@ -617,7 +617,10 @@ bs:
return (~(ulonglong) 0);
}
return (negative ? -((longlong) res) : (longlong) res);
/* Avoid undefinite behavior - negation of LONGLONG_MIN */
return negative && (longlong) res != LONGLONG_MIN ?
-((longlong) res) :
(longlong) res;
}
@ -1009,6 +1012,8 @@ end4:
{
if (li > MAX_NEGATIVE_NUMBER)
goto overflow;
if (li == MAX_NEGATIVE_NUMBER) // Avoid undefinite behavior in negation
return LONGLONG_MIN;
return -((longlong) li);
}
return (longlong) li;
@ -2589,6 +2594,8 @@ end4:
{
if (li > MAX_NEGATIVE_NUMBER)
goto overflow;
if (li == MAX_NEGATIVE_NUMBER) // Avoid undefinite behavior in negation
return LONGLONG_MIN;
return -((longlong) li);
}
return (longlong) li;

4
strings/my_strtoll10.c
View file

@ -241,8 +241,10 @@ end4:
*endptr= (char*) s;
if (negative)
{
if (li >= MAX_NEGATIVE_NUMBER) // Avoid undefined behavior
if (li > MAX_NEGATIVE_NUMBER)
goto overflow;
if (li == MAX_NEGATIVE_NUMBER) // Avoid undefined behavior
return LONGLONG_MIN;
return -((longlong) li);
}
return (longlong) li;