Fix memleak

2 files changed, 5 insertions, 6 deletions

diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index f07d520..3ba161e 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -131,33 +131,32 @@ bool OSQLiteDriver::open() {
 
     /* failed to open */
     if (m_sqlite == 0l ) {
         // FIXME set the last error
         qWarning("OSQLiteDriver::open: %s", error );
         free( error );
         return false;
     }
-    sqreg = (sqregex *)malloc(sizeof(sqreg));
     sqlite_create_function(m_sqlite,"rlike",3,rlikeFunc,&sqreg);
     return true;
 }
 
 
 /* close the db
  * sqlite closes them without
  * telling failure or success
  */
 bool OSQLiteDriver::close() {
     if (m_sqlite )
         sqlite_close( m_sqlite ), m_sqlite=0l;
-	if (sqreg->regex_raw != NULL){
-    	    free(sqreg->regex_raw);
-	    sqreg->regex_raw=NULL;
-	    regfree(&sqreg->regex_c);
+	if (sqreg.regex_raw != NULL){
+    	    free(sqreg.regex_raw);
+	    sqreg.regex_raw=NULL;
+	    regfree(&sqreg.regex_c);
 	}
     return true;
 }
 
 
 /* Query */
 OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
     if ( !m_sqlite ) {
diff --git a/libopie2/opiedb/osqlitedriver.h b/libopie2/opiedb/osqlitedriver.h
index 95c9e2f..adec331 100644
--- a/libopie2/opiedb/osqlitedriver.h
+++ b/libopie2/opiedb/osqlitedriver.h
@@ -36,15 +36,15 @@ public:
 private:
     OSQLError m_lastE;
     OSQLResult m_result;
     OSQLResultItem m_items;
     int handleCallBack( int, char**, char** );
     static int call_back( void*, int, char**, char** );
     QString m_url;
     sqlite *m_sqlite;
-    sqregex *sqreg;
+    sqregex sqreg;
 };
 }
 }
 }
 
 #endif