diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-12-06 16:11:10 +0100 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-12-06 16:24:37 +0100 |
commit | 84c858484059742d577abf9a78f2d6e99ced9477 (patch) | |
tree | 688f26f7f323b6400ad6ef1458e75d34998a580a /vala/valaobjectcreationexpression.vala | |
parent | 1a90e25090d9623455f269ba8db4422c29747adc (diff) | |
download | vala-84c858484059742d577abf9a78f2d6e99ced9477.tar.gz |
vala: Don't transform an explicit "null" into a valid format-string
https://bugzilla.gnome.org/show_bug.cgi?id=791215
Diffstat (limited to 'vala/valaobjectcreationexpression.vala')
-rw-r--r-- | vala/valaobjectcreationexpression.vala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vala/valaobjectcreationexpression.vala b/vala/valaobjectcreationexpression.vala index 4e5a9b958..e203a1a2b 100644 --- a/vala/valaobjectcreationexpression.vala +++ b/vala/valaobjectcreationexpression.vala @@ -385,7 +385,9 @@ public class Vala.ObjectCreationExpression : Expression { // printf arguments if (m.printf_format) { StringLiteral format_literal = null; - if (last_arg != null) { + if (last_arg is NullLiteral) { + // do not replace explicit null + } else if (last_arg != null) { // use last argument as format string format_literal = StringLiteral.get_format_literal (last_arg); if (format_literal == null && args.size == m.get_parameters ().size - 1) { |