Skip to content

Forbid StringConstant(null) #23064

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 9, 2025
Merged

Forbid StringConstant(null) #23064

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bbe2dde
Fix `Constant` tag of `Expr(null: String)`
mbovel Apr 28, 2025
e0fbfde
Accept `null` in `StringToExpr` but not in `StringConstant`
mbovel Apr 30, 2025
2e3c803
Do not handle `null` in `StringToExpr`
mbovel May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2529,7 +2529,7 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
end StringConstantTypeTest

object StringConstant extends StringConstantModule:
def apply(x: String): StringConstant = dotc.core.Constants.Constant(x)
def apply(x: String): StringConstant = dotc.core.Constants.Constant(x: Any)
Copy link
Member

@hamzaremmal hamzaremmal Apr 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a fix to what I believe is a soundness hole in explicit nulls. I'm going to try to have another example with more details about this soundness issue.

Copy link
Member

@noti0na1 noti0na1 Apr 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If there is unsafe data feed into explicit nulls, there is nothing we can do other than runtime check.

Copy link
Contributor

@He-Pin He-Pin Apr 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is a valid fix, then comments is needed inline

Copy link

@Alexey-NM Alexey-NM Apr 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

May be it is better to add:

object dotc.core.Constants.Constant{
  val nullConstant: Constant  = new Constant(null, NullTag)
}

def apply(x: String): StringConstant = if (x==null) {dotc.core.Constants.nullConstant} else {dotc.core.Constants.Constant(x)}

Copy link
Member Author

@mbovel mbovel Apr 30, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was also surprised when I discovered true/false/null constants are not re-used/interned/hash-consed. I don't know if that would have a significant impact. I think this could be discussed in a separate issue or PR.

def unapply(constant: StringConstant): Some[String] = Some(constant.stringValue)
end StringConstant

Expand Down
1 change: 1 addition & 0 deletions tests/run-macros/i23008.check
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
null
12 changes: 12 additions & 0 deletions tests/run-macros/i23008/Macros_1.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import scala.quoted.*

object Macros {
inline def buildString = ${buildStringCode}

def buildStringCode(using Quotes): Expr[String] = {
import quotes.reflect.*
val str: String = null
val exprString = Expr(str)
Expr(exprString.show)
}
}
2 changes: 2 additions & 0 deletions tests/run-macros/i23008/Test_2.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@main def Test =
println(Macros.buildString)
Loading