From 561fa7905030cb1240b7359ba829fa5afbf45b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zsolt=20V=C3=A1radi?= <vzsg@users.noreply.github.com>
Date: Sun, 8 Sep 2019 11:05:03 +0200
Subject: [PATCH] Handle NULLs when decoding arrays (#142)

* Add crashing test for decoding an array with NULL values

* Fix crash on NULL values inside arrays
---
 .../Codable/PostgreSQLDataDecoder.swift          |  7 +++++++
 Tests/PostgreSQLTests/ConnectionTests.swift      | 16 ++++++++++++++++
 Tests/PostgreSQLTests/XCTestManifests.swift      |  1 +
 3 files changed, 24 insertions(+)

diff --git a/Sources/PostgreSQL/Codable/PostgreSQLDataDecoder.swift b/Sources/PostgreSQL/Codable/PostgreSQLDataDecoder.swift
index 53735a25..d416267b 100644
--- a/Sources/PostgreSQL/Codable/PostgreSQLDataDecoder.swift
+++ b/Sources/PostgreSQL/Codable/PostgreSQLDataDecoder.swift
@@ -63,6 +63,13 @@ struct PostgreSQLDataDecoder {
                     let _ = value.extract(Int32.self).bigEndian
                     for _ in 0..<count {
                         let count = Int(value.extract(Int32.self).bigEndian)
+
+                        // Postgres sends -1 to distinguish an empty byte sequence from NULLs
+                        guard count != -1 else {
+                            array.append(.null)
+                            continue
+                        }
+
                         let subValue = value.extract(count: count)
                         let psqlData = PostgreSQLData(type, binary: subValue)
                         array.append(psqlData)
diff --git a/Tests/PostgreSQLTests/ConnectionTests.swift b/Tests/PostgreSQLTests/ConnectionTests.swift
index c0eedabd..f69d4c74 100644
--- a/Tests/PostgreSQLTests/ConnectionTests.swift
+++ b/Tests/PostgreSQLTests/ConnectionTests.swift
@@ -670,6 +670,22 @@ class ConnectionTests: XCTestCase {
             XCTAssertEqual(polygon.polygon.points[3].y, 200)
         }.wait()
     }
+
+    func testGH141() throws {
+        let conn = try PostgreSQLConnection.makeTest()
+        defer { conn.close() }
+
+        struct Test: Decodable {
+            let arr: [String?]
+        }
+
+        let result = try conn.raw("SELECT ARRAY[NULL, 'foo', NULL, 'bar'] AS arr")
+            .all(decoding: Test.self)
+            .wait()
+
+        XCTAssertEqual(1, result.count)
+        XCTAssertEqual([nil, "foo", nil, "bar"], result[0].arr)
+    }
 }
 
 extension PostgreSQLConnection {
diff --git a/Tests/PostgreSQLTests/XCTestManifests.swift b/Tests/PostgreSQLTests/XCTestManifests.swift
index bb4d9c70..f9c60bf1 100644
--- a/Tests/PostgreSQLTests/XCTestManifests.swift
+++ b/Tests/PostgreSQLTests/XCTestManifests.swift
@@ -11,6 +11,7 @@ extension ConnectionTests {
         ("testDataDecoder", testDataDecoder),
         ("testEmptyArray", testEmptyArray),
         ("testGH125", testGH125),
+        ("testGH141", testGH141),
         ("testGH24", testGH24),
         ("testGH46", testGH46),
         ("testInvalidDate", testInvalidDate),