SecBSD/ports
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

As we discussed in the last meeting, we reset the ports tree and began from scratch, even though this change involves porting all the packages. Starting small and growing gradually, this approach will reduce build times and consequently lower energy consumption in a world affected by climate change. We will add new ports as users needs arise; ok h3artbl33d@

Browse source
This commit is contained in:
purplerain 2024-05-26 03:08:12 +00:00
parent 83a0aaf92c
commit 9a3af55370
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
59377 changed files with 98673 additions and 4712155 deletions
Download patch file Download diff file Expand all files Collapse all files

98
databases/mariadb/patches/patch-sql_item_strfunc_cc Normal file
View file

@ -0,0 +1,98 @@
[PATCH] MDEV-31963 Fix libfmt usage in SFORMAT
`fmt::detail::make_arg` does not accept temporaries. Make it happy by
storing the format arg values in a temporary array first.
cd5808eb8da13c5626d4bdeb452cef6ada29cb1d
Index: sql/item_strfunc.cc
--- sql/item_strfunc.cc.orig
+++ sql/item_strfunc.cc
@@ -1382,11 +1382,24 @@ namespace fmt {
*/
String *Item_func_sformat::val_str(String *res)
{
+ /*
+ A union that stores a numeric format arg value.
+ fmt::detail::make_arg does not accept temporaries, so all of its numeric
+ args are temporarily stored in the fmt_args array.
+ See: https://github.com/fmtlib/fmt/issues/3596
+ */
+ union Format_arg_store {
+ longlong val_int;
+ float val_float;
+ double val_double;
+ };
+
DBUG_ASSERT(fixed());
- using ctx= fmt::format_context;
- String *fmt_arg= NULL;
- String *parg= NULL;
- fmt::format_args::format_arg *vargs= NULL;
+ using ctx= fmt::format_context;
+ String *fmt_arg= NULL;
+ String *parg= NULL;
+ fmt::format_args::format_arg *vargs= NULL;
+ Format_arg_store *fmt_args= NULL;
null_value= true;
if (!(fmt_arg= args[0]->val_str(res)))
@@ -1395,25 +1408,39 @@ String *Item_func_sformat::val_str(String *res)
if (!(vargs= new fmt::format_args::format_arg[arg_count - 1]))
return NULL;
+ if (!(fmt_args= new Format_arg_store[arg_count - 1]))
+ {
+ delete [] vargs;
+ return NULL;
+ }
+
/* Creates the array of arguments for vformat */
for (uint carg= 1; carg < arg_count; carg++)
{
switch (args[carg]->result_type())
{
case INT_RESULT:
- vargs[carg-1]= fmt::detail::make_arg<ctx>(args[carg]->val_int());
+ fmt_args[carg-1].val_int= args[carg]->val_int();
+ vargs[carg-1]= fmt::detail::make_arg<ctx>(fmt_args[carg-1].val_int);
break;
case DECIMAL_RESULT: // TODO
case REAL_RESULT:
if (args[carg]->field_type() == MYSQL_TYPE_FLOAT)
- vargs[carg-1]= fmt::detail::make_arg<ctx>((float)args[carg]->val_real());
+ {
+ fmt_args[carg-1].val_float= (float)args[carg]->val_real();
+ vargs[carg-1]= fmt::detail::make_arg<ctx>(fmt_args[carg-1].val_float);
+ }
else
- vargs[carg-1]= fmt::detail::make_arg<ctx>(args[carg]->val_real());
+ {
+ fmt_args[carg-1].val_double= args[carg]->val_real();
+ vargs[carg-1]= fmt::detail::make_arg<ctx>(fmt_args[carg-1].val_double);
+ }
break;
case STRING_RESULT:
if (!(parg= args[carg]->val_str(&val_arg[carg-1])))
{
delete [] vargs;
+ delete [] fmt_args;
return NULL;
}
vargs[carg-1]= fmt::detail::make_arg<ctx>(*parg);
@@ -1423,6 +1450,7 @@ String *Item_func_sformat::val_str(String *res)
default:
DBUG_ASSERT(0);
delete [] vargs;
+ delete [] fmt_args;
return NULL;
}
}
@@ -1446,6 +1474,7 @@ String *Item_func_sformat::val_str(String *res)
null_value= true;
}
delete [] vargs;
+ delete [] fmt_args;
return null_value ? NULL : res;
}