summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--redland/UnpackedTarball_redland.mk1
-rw-r--r--redland/redland/redland-query-rasqal-avoid-assert.patch.117
2 files changed, 18 insertions, 0 deletions
diff --git a/redland/UnpackedTarball_redland.mk b/redland/UnpackedTarball_redland.mk
index dd2a15c41e04..f90702d80fff 100644
--- a/redland/UnpackedTarball_redland.mk
+++ b/redland/UnpackedTarball_redland.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,redland,$(REDLAND_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_file,redland,src/librdf.h,redland/redland/librdf.h))
$(eval $(call gb_UnpackedTarball_add_patches,redland,\
+ redland/redland/redland-query-rasqal-avoid-assert.patch.1 \
redland/redland/redland-pkgconfig.patch.1 \
redland/redland/redland-freebsd.patch.1 \
redland/redland/redland-msvc.patch.1 \
diff --git a/redland/redland/redland-query-rasqal-avoid-assert.patch.1 b/redland/redland/redland-query-rasqal-avoid-assert.patch.1
new file mode 100644
index 000000000000..f21906064237
--- /dev/null
+++ b/redland/redland/redland-query-rasqal-avoid-assert.patch.1
@@ -0,0 +1,17 @@
+avoid an assert inside rasqal_query_results_next_triple
+
+Happens on the "CONSTRUCT" query in the unordf test.
+
+--- redland/src/rdf_query_rasqal.c 2013-04-14 17:32:08.442000000 +0200
++++ redland/src/rdf_query_rasqal.c 2013-04-14 17:31:57.834000000 +0200
+@@ -1096,7 +1096,9 @@
+ scontext->statement=NULL;
+ }
+
+- scontext->finished=rasqal_query_results_next_triple(scontext->qcontext->results);
++ scontext->finished = !scontext->qcontext->results;
++ if(!scontext->finished)
++ scontext->finished=rasqal_query_results_next_triple(scontext->qcontext->results);
+ if(!scontext->finished)
+ librdf_query_rasqal_query_results_update_statement(scontext);
+