diff options
author | Symphorien Gibol <symphorien+git@xlumurb.eu> | 2020-08-08 12:00:00 +0000 |
---|---|---|
committer | Robert Helgesson <robert@rycee.net> | 2020-08-12 22:53:28 +0200 |
commit | e1fbb74b41e773bf81f8095710980bb99518e841 (patch) | |
tree | ea30e92923b7aa527da93328a9606510fdf9821a | |
parent | d1f4d1514d6295907759b386d8d7c8d85a864564 (diff) |
lib.gvariant: escape backslashes in strings
PR #1433
-rw-r--r-- | modules/lib/gvariant.nix | 2 | ||||
-rw-r--r-- | tests/lib/types/gvariant-merge.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/lib/gvariant.nix b/modules/lib/gvariant.nix index 3bfa18cb4db..92aa7d98371 100644 --- a/modules/lib/gvariant.nix +++ b/modules/lib/gvariant.nix @@ -123,7 +123,7 @@ in rec { mkString = v: mkPrimitive type.string v // { - __toString = self: "'${escape [ "'" ] self.value}'"; + __toString = self: "'${escape [ "'" "\\" ] self.value}'"; }; mkObjectpath = v: diff --git a/tests/lib/types/gvariant-merge.nix b/tests/lib/types/gvariant-merge.nix index fce50e0da3c..867534c1f14 100644 --- a/tests/lib/types/gvariant-merge.nix +++ b/tests/lib/types/gvariant-merge.nix @@ -26,6 +26,7 @@ in { { string = "foo"; } { string = "foo"; } + { escapedString = "' \\"; } { tuple = mkTuple [ 1 [ "foo" ] ]; } @@ -46,6 +47,7 @@ in { bool = true emptyArray1 = @as [] emptyArray2 = @as [] + escapedString = '\' \\' float = 3.140000 int = 42 list = @as ['one','two'] |