mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-26 05:00:16 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix Bugzilla 24622 - Modify const data with void[] concatenation/append (#16606)

Browse source
This commit is contained in:
Nick Treleaven 2024-06-21 16:57:47 +01:00 • committed by GitHub
parent 9773c41a13
commit 3949a4dd3b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/src/dmd/expressionsem.d
View file

@ -11873,6 +11873,8 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
(tb2.ty == Tarray || tb2.ty == Tsarray) && (tb2.ty == Tarray || tb2.ty == Tsarray) &&
(exp.e2.implicitConvTo(exp.e1.type) || (exp.e2.implicitConvTo(exp.e1.type) ||
(tb2.nextOf().implicitConvTo(tb1next) && (tb2.nextOf().implicitConvTo(tb1next) &&
// Do not strip const(void)[]
(!global.params.fixImmutableConv || tb1next.ty != Tvoid) &&
(tb2.nextOf().size(Loc.initial) == tb1next.size(Loc.initial))))) (tb2.nextOf().size(Loc.initial) == tb1next.size(Loc.initial)))))
{ {
// EXP.concatenateAssign // EXP.concatenateAssign
@ -12622,7 +12624,9 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
exp.type = tb.nextOf().arrayOf(); exp.type = tb.nextOf().arrayOf();
if (exp.type.ty == Tarray && tb1next && tb2next && tb1next.mod != tb2next.mod) if (exp.type.ty == Tarray && tb1next && tb2next && tb1next.mod != tb2next.mod)
{ {
exp.type = exp.type.nextOf().toHeadMutable().arrayOf(); // Do not strip const(void)[]
if (!global.params.fixImmutableConv || tb.nextOf().ty != Tvoid)
exp.type = exp.type.nextOf().toHeadMutable().arrayOf();
} }
if (Type tbn = tb.nextOf()) if (Type tbn = tb.nextOf())
{ {

21
compiler/test/fail_compilation/void_cat.d Normal file
View file

@ -0,0 +1,21 @@
/*
REQUIRED_ARGS: -preview=fixImmutableConv
TEST_OUTPUT:
---
fail_compilation/void_cat.d(15): Error: cannot copy `const(void)[]` to `void[]`
fail_compilation/void_cat.d(15): Source data has incompatible type qualifier(s)
fail_compilation/void_cat.d(15): Use `cast(void[])` to force copy
fail_compilation/void_cat.d(19): Error: cannot append type `const(void)[]` to type `void[]`
---
*/
void g(int*[] a, const(int*)[] b) @system
{
void[] va = a;
va[] = va.init ~ b; // a now contains b's data
*a[0] = 0; // modify const data
const(void)[] vb = b;
va ~= vb; // also leaks const pointers into void[]
// va could be copied into `a` via another void[]
}