You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2012/05/22 00:22:03 UTC

svn commit: r1341232 - /subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c

Author: rhuijben
Date: Mon May 21 22:22:03 2012
New Revision: 1341232

URL: http://svn.apache.org/viewvc?rev=1341232&view=rev
Log:
* subversion/tests/libsvn_wc/wc-queries-test.c
  (test_query_expectations): Avoid a possible segfault with Sqlite 3.7.2.

Modified:
    subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c

Modified: subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c?rev=1341232&r1=1341231&r2=1341232&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/wc-queries-test.c Mon May 21 22:22:03 2012
@@ -28,10 +28,10 @@
 
 #include "../svn_test.h"
 
-#ifdef SVN_SQLITE_INLINE
+#ifndef SVN_SQLITE_INLINE
 /* Include sqlite3 inline, making all symbols private. */
   #define SQLITE_API static
-  #include <sqlite3.c>
+  #include "sqlite3.c"
 #else
   #include <sqlite3.h>
 #endif
@@ -538,6 +538,9 @@ test_query_expectations(apr_pool_t *scra
           iFrom = sqlite3_column_int(stmt, 2);*/
           zDetail = sqlite3_column_text(stmt, 3);
 
+          if (! zDetail)
+            continue;
+
           detail = apr_pstrdup(iterpool, (const char*)zDetail);
 
           SVN_ERR(parse_explanation_item(&item, detail, iterpool));