diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-14 17:45:40 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-15 15:26:31 +0200 |
| commit | 21edda30c6309a81b05c7b6759725bb0f4652eca (patch) | |
| tree | 38f7042744eca2960acb0996a197f0915bc46a13 /redland | |
| parent | 9ad00439ae205d7e0eaa39a807daea8268a4ecd4 (diff) | |
redland: fix an assertion in MSVC _DEBUG build
Change-Id: I66d6932b0fa9753c56e6b6fc9dc0dd5fcbba3b36
Diffstat (limited to 'redland')
| -rw-r--r-- | redland/UnpackedTarball_redland.mk | 1 | ||||
| -rw-r--r-- | redland/redland/redland-query-rasqal-avoid-assert.patch.1 | 17 |
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); + |