1 files changed, 19 insertions, 12 deletions

diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index eea1093..4eda9b9 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -43,2 +43,4 @@
 
+	char *regex_raw;
+	regex_t regex_c;
 
@@ -86,20 +88,23 @@ void OSQLiteDriver::setOptions( const QStringList& ) {
 
-/*------------------------------------------------------------------/*
+/*
  * Functions to patch a regex search into sqlite
- * -----------------------------------------------------------------*/
+ */
 int sqliteRlikeCompare(const char *zPattern, const char *zString){
-	  regex_t regex;
 	int res;
-	if ( zPattern==NULL || zString==NULL ) {
-		printf("One of the args was null!\n");
-		return 0;
-	}
-	res = regcomp(&regex, zPattern, REG_EXTENDED);
+	if (regex_raw == NULL || (strcmp (zPattern, regex_raw) != 0)){
+		if (regex_raw != NULL) {
+		    free(regex_raw);
+		    regfree(&regex_c);
+		}
+		regex_raw = (char *)malloc(strlen(zPattern)+1);
+		strncpy(regex_raw, zPattern, strlen(zPattern)+1);
+		res = regcomp(&regex_c, zPattern, REG_EXTENDED);
 	if ( res != 0 ) {
 		printf("Regcomp failed with code %u on string %s\n",res,zPattern);
-
+		    free(regex_raw);
+		    regex_raw=NULL;
 		return 0;
 	}
-	res = (regexec(&regex, zString, 0, NULL, 0)==0);
-	regfree(&regex);
+	}
+	res = (regexec(&regex_c, zString, 0, NULL, 0)==0);
 	return res;
@@ -144,3 +149,5 @@ bool OSQLiteDriver::close() {
         sqlite_close( m_sqlite ), m_sqlite=0l;
-
+	free(regex_raw);
+	regex_raw=NULL;
+	regfree(&regex_c);
     return true;