Attachment 250324 Details for Bug 278669 – Fix xmoto DB access

[patch] Fix xmoto DB access

xmoto-dqs.patch (text/plain), 1.63 KB, created by Dave Vasilevsky on 2024-05-01 21:38:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Vasilevsky

Created: 2024-05-01 21:38:31 UTC

Size: 1.63 KB

patch

obsolete

>From 0f091ec787da212b45f5bbe52ec5b843ceb31fe6 Mon Sep 17 00:00:00 2001
>From: Dave Vasilevsky <dave@vasilevsky.ca>
>Date: Tue, 30 Apr 2024 15:44:27 -0400
>Subject: [PATCH] games/xmoto: Fix database double-quoting crash
>
>When sqlite is built with DQS disabled by default, xmoto still needs this
>SQL quirk.
>
>See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278669
>
>Signed-off-by: Dave Vasilevsky <dave@vasilevsky.ca>
>---
> games/xmoto/Makefile                          |  2 +-
> games/xmoto/files/patch-src_db_xmDatabase.cpp | 13 +++++++++++++
> 2 files changed, 14 insertions(+), 1 deletion(-)
> create mode 100644 games/xmoto/files/patch-src_db_xmDatabase.cpp
>
>diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile
>index 7dcc488863a4d..acd6e9bba9881 100644
>--- a/games/xmoto/Makefile
>+++ b/games/xmoto/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	xmoto
> DISTVERSIONPREFIX=	v
> DISTVERSION=	0.6.2
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	games
> 
> MAINTAINER=	amdmi3@FreeBSD.org
>diff --git a/games/xmoto/files/patch-src_db_xmDatabase.cpp b/games/xmoto/files/patch-src_db_xmDatabase.cpp
>new file mode 100644
>index 0000000000000..bf49c52bfef4c
>--- /dev/null
>+++ b/games/xmoto/files/patch-src_db_xmDatabase.cpp
>@@ -0,0 +1,13 @@
>+--- src/db/xmDatabase.cpp.orig	2024-04-30 19:43:06 UTC
>++++ src/db/xmDatabase.cpp
>+@@ -58,6 +58,10 @@ void xmDatabase::openIfNot(const std::string &i_dbFile
>+                     ") : " + sqlite3_errmsg(m_db));
>+   }
>+ 
>++#ifdef SQLITE_DBCONFIG_DQS_DML
>++  sqlite3_db_config(m_db, SQLITE_DBCONFIG_DQS_DML, 1, NULL);
>++#endif
>++
>+   sqlite3_busy_timeout(m_db, DB_BUSY_TIMEOUT);
>+   sqlite3_trace(m_db, sqlTrace, NULL);
>+   createUserFunctions();

Actions: View | Diff

Attachments on bug 278669: 250324