Skip to content

Commit f807905

Browse files
geoffw0geoffw0
committed
Swift: Fix test on Linux.
1 parent b6db0de commit f807905

File tree

3 files changed

+37
-29
lines changed

3 files changed

+37
-29
lines changed

‎swift/ql/test/library-tests/dataflow/taint/LocalTaint.expected‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -558,22 +558,30 @@
558558
| nsmutabledata.swift:48:9:48:9 | SSA def(nsMutableDataTainted6) | nsmutabledata.swift:49:15:49:15 | nsMutableDataTainted6 |
559559
| nsmutabledata.swift:48:33:48:40 | call to source() | nsmutabledata.swift:48:9:48:9 | SSA def(nsMutableDataTainted6) |
560560
| nsmutabledata.swift:49:15:49:15 | nsMutableDataTainted6 | nsmutabledata.swift:49:15:49:37 | .mutableBytes |
561-
| nsstring.swift:6:7:6:7 | SSA def(self) | nsstring.swift:6:7:6:7 | self[return] |
562-
| nsstring.swift:6:7:6:7 | SSA def(self) | nsstring.swift:6:7:6:7 | self[return] |
563-
| nsstring.swift:6:7:6:7 | self | nsstring.swift:6:7:6:7 | SSA def(self) |
564-
| nsstring.swift:6:7:6:7 | self | nsstring.swift:6:7:6:7 | SSA def(self) |
565-
| nsstring.swift:7:8:7:8 | SSA def(self) | nsstring.swift:7:3:7:33 | self[return] |
566-
| nsstring.swift:7:8:7:8 | self | nsstring.swift:7:8:7:8 | SSA def(self) |
567-
| nsstring.swift:8:8:8:8 | SSA def(self) | nsstring.swift:8:3:8:40 | self[return] |
568-
| nsstring.swift:8:8:8:8 | self | nsstring.swift:8:8:8:8 | SSA def(self) |
569-
| nsstring.swift:11:8:11:8 | SSA def(self) | nsstring.swift:11:8:11:8 | self[return] |
561+
| nsstring.swift:6:8:6:8 | SSA def(self) | nsstring.swift:6:8:6:8 | self[return] |
562+
| nsstring.swift:6:8:6:8 | self | nsstring.swift:6:8:6:8 | SSA def(self) |
563+
| nsstring.swift:7:7:7:7 | self | nsstring.swift:7:7:7:7 | SSA def(self) |
564+
| nsstring.swift:7:26:7:26 | SSA def(self) | nsstring.swift:7:26:7:57 | self[return] |
565+
| nsstring.swift:7:26:7:26 | self | nsstring.swift:7:26:7:26 | SSA def(self) |
566+
| nsstring.swift:7:40:7:40 | 0 | nsstring.swift:7:39:7:55 | ...! |
567+
| nsstring.swift:7:71:7:71 | SSA def(self) | nsstring.swift:7:71:7:77 | self[return] |
568+
| nsstring.swift:7:71:7:71 | self | nsstring.swift:7:71:7:71 | SSA def(self) |
569+
| nsstring.swift:10:7:10:7 | SSA def(self) | nsstring.swift:10:7:10:7 | self[return] |
570+
| nsstring.swift:10:7:10:7 | SSA def(self) | nsstring.swift:10:7:10:7 | self[return] |
571+
| nsstring.swift:10:7:10:7 | self | nsstring.swift:10:7:10:7 | SSA def(self) |
572+
| nsstring.swift:10:7:10:7 | self | nsstring.swift:10:7:10:7 | SSA def(self) |
573+
| nsstring.swift:11:8:11:8 | SSA def(self) | nsstring.swift:11:3:11:33 | self[return] |
570574
| nsstring.swift:11:8:11:8 | self | nsstring.swift:11:8:11:8 | SSA def(self) |
571-
| nsstring.swift:22:7:22:7 | SSA def(self) | nsstring.swift:22:7:22:7 | self[return] |
572-
| nsstring.swift:22:7:22:7 | self | nsstring.swift:22:7:22:7 | SSA def(self) |
573-
| nsstring.swift:22:56:22:56 | SSA def(self) | nsstring.swift:22:56:22:56 | self[return] |
574-
| nsstring.swift:22:56:22:56 | self | nsstring.swift:22:56:22:56 | SSA def(self) |
575-
| nsstring.swift:24:9:24:9 | self | nsstring.swift:24:9:24:9 | SSA def(self) |
576-
| nsstring.swift:28:9:28:9 | self | nsstring.swift:28:9:28:9 | SSA def(self) |
575+
| nsstring.swift:12:8:12:8 | SSA def(self) | nsstring.swift:12:3:12:40 | self[return] |
576+
| nsstring.swift:12:8:12:8 | self | nsstring.swift:12:8:12:8 | SSA def(self) |
577+
| nsstring.swift:15:8:15:8 | SSA def(self) | nsstring.swift:15:8:15:8 | self[return] |
578+
| nsstring.swift:15:8:15:8 | self | nsstring.swift:15:8:15:8 | SSA def(self) |
579+
| nsstring.swift:26:7:26:7 | SSA def(self) | nsstring.swift:26:7:26:7 | self[return] |
580+
| nsstring.swift:26:7:26:7 | self | nsstring.swift:26:7:26:7 | SSA def(self) |
581+
| nsstring.swift:26:56:26:56 | SSA def(self) | nsstring.swift:26:56:26:56 | self[return] |
582+
| nsstring.swift:26:56:26:56 | self | nsstring.swift:26:56:26:56 | SSA def(self) |
583+
| nsstring.swift:27:54:27:54 | self | nsstring.swift:27:54:27:54 | SSA def(self) |
584+
| nsstring.swift:29:43:29:43 | self | nsstring.swift:29:43:29:43 | SSA def(self) |
577585
| nsstring.swift:31:3:31:3 | SSA def(self) | nsstring.swift:31:3:31:58 | self[return] |
578586
| nsstring.swift:31:3:31:3 | self | nsstring.swift:31:3:31:3 | SSA def(self) |
579587
| nsstring.swift:32:3:32:3 | SSA def(self) | nsstring.swift:32:3:32:113 | self[return] |

‎swift/ql/test/library-tests/dataflow/taint/Taint.expected‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,8 @@ edges
331331
| nsmutabledata.swift:48:33:48:40 | call to source() : | nsmutabledata.swift:49:15:49:37 | .mutableBytes |
332332
| nsmutabledata.swift:49:15:49:15 | nsMutableDataTainted6 : | nsmutabledata.swift:13:9:13:9 | self : |
333333
| nsmutabledata.swift:49:15:49:15 | nsMutableDataTainted6 : | nsmutabledata.swift:49:15:49:37 | .mutableBytes |
334-
| nsstring.swift:7:3:7:33 | [summary param] this in copy() : | file://:0:0:0:0 | [summary] to write: return (return) in copy() : |
335-
| nsstring.swift:8:3:8:40 | [summary param] this in mutableCopy() : | file://:0:0:0:0 | [summary] to write: return (return) in mutableCopy() : |
334+
| nsstring.swift:11:3:11:33 | [summary param] this in copy() : | file://:0:0:0:0 | [summary] to write: return (return) in copy() : |
335+
| nsstring.swift:12:3:12:40 | [summary param] this in mutableCopy() : | file://:0:0:0:0 | [summary] to write: return (return) in mutableCopy() : |
336336
| nsstring.swift:31:3:31:58 | [summary param] 0 in NSString.init(characters:length:) : | file://:0:0:0:0 | [summary] to write: return (return) in NSString.init(characters:length:) : |
337337
| nsstring.swift:32:3:32:113 | [summary param] 0 in NSString.init(charactersNoCopy:length:freeWhenDone:) : | file://:0:0:0:0 | [summary] to write: return (return) in NSString.init(charactersNoCopy:length:freeWhenDone:) : |
338338
| nsstring.swift:33:3:33:33 | [summary param] 0 in NSString.init(string:) : | file://:0:0:0:0 | [summary] to write: return (return) in NSString.init(string:) : |
@@ -591,9 +591,9 @@ edges
591591
| nsstring.swift:383:15:383:30 | call to sourceNSString() : | nsstring.swift:386:13:386:13 | str20 : |
592592
| nsstring.swift:383:15:383:30 | call to sourceNSString() : | nsstring.swift:387:13:387:13 | str20 : |
593593
| nsstring.swift:383:15:383:30 | call to sourceNSString() : | nsstring.swift:388:13:388:13 | str20 : |
594-
| nsstring.swift:385:13:385:13 | str20 : | nsstring.swift:7:3:7:33 | [summary param] this in copy() : |
594+
| nsstring.swift:385:13:385:13 | str20 : | nsstring.swift:11:3:11:33 | [summary param] this in copy() : |
595595
| nsstring.swift:385:13:385:13 | str20 : | nsstring.swift:385:13:385:24 | call to copy() |
596-
| nsstring.swift:386:13:386:13 | str20 : | nsstring.swift:8:3:8:40 | [summary param] this in mutableCopy() : |
596+
| nsstring.swift:386:13:386:13 | str20 : | nsstring.swift:12:3:12:40 | [summary param] this in mutableCopy() : |
597597
| nsstring.swift:386:13:386:13 | str20 : | nsstring.swift:386:13:386:31 | call to mutableCopy() |
598598
| nsstring.swift:387:13:387:13 | str20 : | nsstring.swift:52:3:52:57 | [summary param] this in copy(with:) : |
599599
| nsstring.swift:387:13:387:13 | str20 : | nsstring.swift:387:13:387:33 | call to copy(with:) |
@@ -1786,8 +1786,8 @@ nodes
17861786
| nsmutabledata.swift:48:33:48:40 | call to source() : | semmle.label | call to source() : |
17871787
| nsmutabledata.swift:49:15:49:15 | nsMutableDataTainted6 : | semmle.label | nsMutableDataTainted6 : |
17881788
| nsmutabledata.swift:49:15:49:37 | .mutableBytes | semmle.label | .mutableBytes |
1789-
| nsstring.swift:7:3:7:33 | [summary param] this in copy() : | semmle.label | [summary param] this in copy() : |
1790-
| nsstring.swift:8:3:8:40 | [summary param] this in mutableCopy() : | semmle.label | [summary param] this in mutableCopy() : |
1789+
| nsstring.swift:11:3:11:33 | [summary param] this in copy() : | semmle.label | [summary param] this in copy() : |
1790+
| nsstring.swift:12:3:12:40 | [summary param] this in mutableCopy() : | semmle.label | [summary param] this in mutableCopy() : |
17911791
| nsstring.swift:31:3:31:58 | [summary param] 0 in NSString.init(characters:length:) : | semmle.label | [summary param] 0 in NSString.init(characters:length:) : |
17921792
| nsstring.swift:32:3:32:113 | [summary param] 0 in NSString.init(charactersNoCopy:length:freeWhenDone:) : | semmle.label | [summary param] 0 in NSString.init(charactersNoCopy:length:freeWhenDone:) : |
17931793
| nsstring.swift:33:3:33:33 | [summary param] 0 in NSString.init(string:) : | semmle.label | [summary param] 0 in NSString.init(string:) : |
@@ -2767,8 +2767,8 @@ subpaths
27672767
| nsstring.swift:311:13:311:28 | call to sourceNSString() : | nsstring.swift:96:3:96:74 | [summary param] this in strings(byAppendingPaths:) : | file://:0:0:0:0 | [summary] to write: return (return) in strings(byAppendingPaths:) : | nsstring.swift:311:13:311:60 | call to strings(byAppendingPaths:) |
27682768
| nsstring.swift:312:13:312:28 | call to sourceNSString() : | nsstring.swift:96:3:96:74 | [summary param] this in strings(byAppendingPaths:) : | file://:0:0:0:0 | [summary] to write: return (return) in strings(byAppendingPaths:) : | nsstring.swift:312:13:312:60 | call to strings(byAppendingPaths:) : |
27692769
| nsstring.swift:334:3:334:18 | call to sourceNSString() : | nsstring.swift:65:3:65:281 | [summary param] this in getBytes(_:maxLength:usedLength:encoding:options:range:remaining:) : | file://:0:0:0:0 | [summary] to write: argument 0 in getBytes(_:maxLength:usedLength:encoding:options:range:remaining:) : | nsstring.swift:334:29:334:29 | [post] ptr3 : |
2770-
| nsstring.swift:385:13:385:13 | str20 : | nsstring.swift:7:3:7:33 | [summary param] this in copy() : | file://:0:0:0:0 | [summary] to write: return (return) in copy() : | nsstring.swift:385:13:385:24 | call to copy() |
2771-
| nsstring.swift:386:13:386:13 | str20 : | nsstring.swift:8:3:8:40 | [summary param] this in mutableCopy() : | file://:0:0:0:0 | [summary] to write: return (return) in mutableCopy() : | nsstring.swift:386:13:386:31 | call to mutableCopy() |
2770+
| nsstring.swift:385:13:385:13 | str20 : | nsstring.swift:11:3:11:33 | [summary param] this in copy() : | file://:0:0:0:0 | [summary] to write: return (return) in copy() : | nsstring.swift:385:13:385:24 | call to copy() |
2771+
| nsstring.swift:386:13:386:13 | str20 : | nsstring.swift:12:3:12:40 | [summary param] this in mutableCopy() : | file://:0:0:0:0 | [summary] to write: return (return) in mutableCopy() : | nsstring.swift:386:13:386:31 | call to mutableCopy() |
27722772
| nsstring.swift:387:13:387:13 | str20 : | nsstring.swift:52:3:52:57 | [summary param] this in copy(with:) : | file://:0:0:0:0 | [summary] to write: return (return) in copy(with:) : | nsstring.swift:387:13:387:33 | call to copy(with:) |
27732773
| nsstring.swift:388:13:388:13 | str20 : | nsstring.swift:53:3:53:64 | [summary param] this in mutableCopy(with:) : | file://:0:0:0:0 | [summary] to write: return (return) in mutableCopy(with:) : | nsstring.swift:388:13:388:40 | call to mutableCopy(with:) |
27742774
| nsstring.swift:392:13:392:35 | call to sourceNSMutableString() : | nsstring.swift:76:3:76:64 | [summary param] this in capitalized(with:) : | file://:0:0:0:0 | [summary] to write: return (return) in capitalized(with:) : | nsstring.swift:392:13:392:58 | call to capitalized(with:) |

‎swift/ql/test/library-tests/dataflow/taint/nsstring.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33

44
typealias unichar = UInt16
55

6+
struct AutoreleasingUnsafeMutablePointer<Pointee> {
7+
var pointee: Pointee { get { return (0 as! Pointee?)! } nonmutating set { } }
8+
}
9+
610
class NSObject {
711
func copy() -> Any { return 0 }
812
func mutableCopy() -> Any { return 0 }
@@ -20,13 +24,9 @@ protocol NSMutableCopying {
2024
}
2125

2226
class NSString : NSObject, NSCopying, NSMutableCopying {
23-
struct EncodingConversionOptions : OptionSet {
24-
let rawValue: Int
25-
}
27+
struct EncodingConversionOptions : OptionSet { let rawValue: Int }
2628

27-
struct CompareOptions : OptionSet {
28-
let rawValue: Int
29-
}
29+
struct CompareOptions : OptionSet { let rawValue: Int }
3030

3131
init(characters: UnsafePointer<unichar>, length: Int) {}
3232
init(charactersNoCopy characters: UnsafeMutablePointer<unichar>, length: Int, freeWhenDone freeBuffer: Bool) {}

0 commit comments

Comments
 (0)