Merge pull request #153 from marc-vanderwal/bugfix/#149

Fix unsafe string manipulations in XS code

2 files changed, 42 insertions, 0 deletions

diff --git a/t/packet.t b/t/packet.t
index 0d55feb..8be8565 100644
--- a/t/packet.t
+++ b/t/packet.t
@@ -28,4 +28,35 @@ is($p->answerfrom, undef, 'No answerfrom');
 $p->answerfrom('127.0.0.1');
 is($p->answerfrom, '127.0.0.1', 'Localhost');
 
+subtest "croak when stringifying packet with malformed CAA" => sub {
+    my $will_croak = sub {
+        # Constructing a synthetic packet that would have the following string
+        # representation in dig-like format:
+        #
+        # ;; ->>HEADER<<- opcode: QUERY, rcode: NOERROR, id: 13944
+        # ;; flags: qr aa ; QUERY: 1, ANSWER: 1, AUTHORITY: 0, ADDITIONAL: 0
+        # ;; QUESTION SECTION:
+        # ;; bad-caa.example.       IN      CAA
+        #
+        # ;; ANSWER SECTION:
+        # bad-caa.example.  3600    IN      CAA     \# 4 C0000202
+        #
+        # ;; AUTHORITY SECTION:
+        #
+        # ;; ADDITIONAL SECTION:
+        my $packet_bin = pack(
+            'H*',
+            '367884000001000100000000' . # header
+            '076261642d636161076578616d706c650001010001' . # question
+            'c00c0101000100000e100004c0000202' # bad answer
+        );
+
+        my $packet = Zonemaster::LDNS::Packet->new_from_wireformat( $packet_bin );
+
+        # This must croak
+        $packet->string;
+    };
+    like( exception { $will_croak->() }, qr/^Failed to convert packet to string/ );
+};
+
 done_testing();
diff --git a/t/rr.t b/t/rr.t
index fdd2bc8..ab7420f 100644
--- a/t/rr.t
+++ b/t/rr.t
@@ -235,4 +235,15 @@ subtest 'SPF' => sub {
 
 };
 
+subtest 'croak when given malformed CAA records' => sub {
+    my $will_croak = sub {
+        # This will croak if LDNS.xs is compiled with -DUSE_ITHREADS
+        my $bad_caa = Zonemaster::LDNS::RR->new(
+            'bad-caa.example.       3600    IN      CAA     \# 4 C0000202' );
+        # This will always croak
+        $bad_caa->string();
+    };
+    like( exception { $will_croak->() }, qr/^Failed to convert RR to string/ );
+};
+
 done_testing;