1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
|
From: Dave Beckett <dave@dajobe.org>
Date: Thu, 6 Feb 2025 21:10:38 -0800
Subject: Tests for Github issue 70
Origin: https://github.com/dajobe/raptor/commit/0f9d4f7216fa310b1583b44321c2e6ff27c552de
Bug: https://github.com/dajobe/raptor/issues/70
Tests for https://github.com/dajobe/raptor/issues/70
A) Integer Underflow in raptor_uri_normalize_path()
B) Heap read buffer overflow in raptor_ntriples_parse_term_internal()
---
.gitignore | 2 +-
configure.ac | 1 +
tests/Makefile.am | 2 +-
tests/bugs/.gitignore | 7 +++++
tests/bugs/Makefile.am | 13 +++++++++
tests/bugs/issue70a.c | 58 +++++++++++++++++++++++++++++++++++++++
tests/bugs/issue70b.c | 61 ++++++++++++++++++++++++++++++++++++++++++
7 files changed, 142 insertions(+), 2 deletions(-)
create mode 100644 tests/bugs/.gitignore
create mode 100644 tests/bugs/Makefile.am
create mode 100644 tests/bugs/issue70a.c
create mode 100644 tests/bugs/issue70b.c
--- a/configure.ac
+++ b/configure.ac
@@ -1338,6 +1338,7 @@ tests/rdfxml/Makefile
tests/turtle/Makefile
tests/turtle-2013/Makefile
tests/trig/Makefile
+tests/bugs/Makefile
utils/Makefile
librdfa/Makefile
raptor2.pc])
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -37,7 +37,7 @@ raptor_empty_test_SOURCES=empty.c
# Used to make N-triples output consistent
BASE_URI=http://librdf.org/raptor/tests/
-SUBDIRS = rdfxml ntriples ntriples-2013 nquads-2013 turtle turtle-2013 trig grddl rdfa rdfa11 json feeds
+SUBDIRS = rdfxml ntriples ntriples-2013 nquads-2013 turtle turtle-2013 trig grddl rdfa rdfa11 json feeds bugs
$(top_builddir)/src/libraptor2.la:
--- /dev/null
+++ b/tests/bugs/.gitignore
@@ -0,0 +1,7 @@
+*.o
+.deps
+.libs
+TAGS
+raptor_issue*_test
+raptor_issue*_test.exe
+raptor_issue*_test.trs
--- /dev/null
+++ b/tests/bugs/Makefile.am
@@ -0,0 +1,13 @@
+TESTS=raptor_issue70a_test$(EXEEXT) raptor_issue70b_test$(EXEEXT)
+
+AM_CPPFLAGS=-I$(top_srcdir)/src
+AM_CFLAGS= -I$(top_builddir)/src @CFLAGS@ $(MEM)
+AM_LDFLAGS=$(top_builddir)/src/libraptor2.la $(MEM_LIBS)
+
+EXTRA_PROGRAMS=$(TESTS)
+
+CLEANFILES=$(TESTS)
+
+raptor_issue70a_test_SOURCES=issue70a.c
+raptor_issue70b_test_SOURCES=issue70b.c
+
--- /dev/null
+++ b/tests/bugs/issue70a.c
@@ -0,0 +1,58 @@
+/* -*- Mode: c; c-basic-offset: 2 -*-
+ *
+ * issue70a.c - Raptor test for GitHub issue 70 first part
+ * Integer Underflow in raptor_uri_normalize_path()
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <raptor_config.h>
+#endif
+
+#include <string.h>
+
+/* Raptor includes */
+#include "raptor2.h"
+#include "raptor_internal.h"
+
+
+int
+main(int argc, const char** argv)
+{
+ const char *program = raptor_basename(argv[0]);
+ const unsigned char* base_uri= (const unsigned char*)"http:o/www.w3.org/2001/sw/DataA#cess/df1.ttl";
+ const unsigned char* reference_uri= (const unsigned char*)".&/../?D/../../1999/02/22-rdf-syntax-ns#";
+#define BUFFER_LEN 84
+ unsigned char buffer[BUFFER_LEN + 1];
+ size_t buffer_length = BUFFER_LEN + 1;
+ int failures = 0;
+#define EXPECTED_RESULT "http:?D/../../1999/02/22-rdf-syntax-ns#"
+#define EXPECTED_RESULT_LEN 39UL
+ int result;
+ size_t result_len;
+
+ buffer[0] = '\0';
+
+ /* Crash used to happens here if RAPTOR_DEBUG > 3
+ * raptor_rfc2396.c:398:raptor_uri_normalize_path: fatal error: Path length 0 does not match calculated -5.
+ */
+ result = raptor_uri_resolve_uri_reference(base_uri, reference_uri,
+ buffer, buffer_length);
+ result_len = strlen((const char*)buffer);
+
+ if(strcmp((const char*)buffer, EXPECTED_RESULT) ||
+ result_len != EXPECTED_RESULT_LEN) {
+ fprintf(stderr, "%s: raptor_uri_resolve_uri_reference() failed with result %d\n", program, result);
+ fprintf(stderr, "%s: Base URI: '%s' (%lu)\n",
+ program, base_uri, strlen((const char*)base_uri));
+ fprintf(stderr, "%s: Ref URI: '%s' (%lu)\n", reference_uri,
+ program, strlen((const char*)reference_uri));
+ fprintf(stderr, "%s: Result buffer: '%s' (%lu)\n", program,
+ buffer, strlen((const char*)buffer));
+ fprintf(stderr, "%s: Expected: '%s' (%lu)\n", program,
+ EXPECTED_RESULT, EXPECTED_RESULT_LEN);
+ failures++;
+ }
+
+ return failures;
+}
--- /dev/null
+++ b/tests/bugs/issue70b.c
@@ -0,0 +1,61 @@
+/* -*- Mode: c; c-basic-offset: 2 -*-
+ *
+ * issue70.c - Raptor test for GitHub issue 70 second part
+ * Heap read buffer overflow in raptor_ntriples_parse_term_internal()
+ *
+ * N-Triples test content: "_:/exaple/o"
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <raptor_config.h>
+#endif
+
+#include <string.h>
+
+/* Raptor includes */
+#include "raptor2.h"
+#include "raptor_internal.h"
+
+
+int
+main(int argc, const char** argv)
+{
+ const char *program = raptor_basename(argv[0]);
+ const unsigned char* ntriples_content = (const unsigned char*)"_:/exaple/o\n";
+#define NTRIPLES_CONTENT_LEN 12
+ const unsigned char* base_uri_string = (const unsigned char*)"http:o/www.w3.org/2001/sw/DataA#cess/df1.ttl";
+ int failures = 0;
+ raptor_world* world = NULL;
+ raptor_uri* base_uri = NULL;
+ raptor_parser* parser = NULL;
+ int result;
+
+ world = raptor_new_world();
+ if(!world)
+ goto cleanup;
+ base_uri = raptor_new_uri(world, base_uri_string);
+ if(!base_uri)
+ goto cleanup;
+ parser = raptor_new_parser(world, "ntriples");
+ if(!parser)
+ goto cleanup;
+
+ (void)raptor_parser_parse_start(parser, base_uri);
+ result = raptor_parser_parse_chunk(parser,
+ ntriples_content,
+ NTRIPLES_CONTENT_LEN, /* is_end */ 1);
+
+ if(result) {
+ fprintf(stderr, "%s: parsing '%s' N-Triples content failed with result %d\n", program, ntriples_content, result);
+ fprintf(stderr, "%s: Base URI: '%s' (%lu)\n",
+ program, base_uri_string, strlen((const char*)base_uri_string));
+ failures++;
+ }
+
+ cleanup:
+ raptor_free_parser(parser);
+ raptor_free_uri(base_uri);
+ raptor_free_world(world);
+
+ return failures;
+}
|
