Changes in trunk/src/sh_database.c [1:3]

File:

• trunk/src/sh_database.c (modified) (5 diffs)

trunk/src/sh_database.c

@@ -38 +38 @@
 #include "sh_error.h"
 #include "sh_utils.h"
+
+extern int safe_logger (int signal, int method, pid_t thepid);
 
 #undef  FIL__
@@ -1009 +1011 @@
 {
   int               status = 0;
-  char            * p;
+  const char      * p;
   static MYSQL    * db_conn = NULL;
   static SH_TIMEOUT sh_timer = { 0, 3600, S_TRUE };
@@ -1447 +1449 @@
           retv = S_FALSE;
         }
+      else if (*p == '\"' && escp == 0)
+        {
+          retv = S_FALSE;
+        }
       else 
         {
@@ -1453 +1459 @@
       ++p;
     }
+  if (escp == 1) 
+    retv = S_FALSE;
   return retv;
 }
@@ -1546 +1554 @@
 
               if (S_FALSE == is_escaped(&p[j+2])) {
+                sh_error_handle((-1), FIL__, __LINE__, 0, MSG_E_SUBGEN,
+                                _("Message not properly escaped"), 
+                                _("sh_database_parse"));
                 SL_RETURN(NULL, _("sh_database_parse"));
               }