diff --git a/valid.c b/valid.c
index 897a368d..a7c4e4a1 100644
--- a/valid.c
+++ b/valid.c
@@ -5171,6 +5171,8 @@ xmlValidateElementContent(xmlValidCtxtPtr ctxt, xmlNodePtr child,
             }
         }
         ret = xmlRegExecPushString(exec, NULL, NULL);
+        if (ret == XML_REGEXP_OUT_OF_MEMORY)
+            xmlVErrMemory(ctxt);
 fail:
         xmlRegFreeExecCtxt(exec);
     }
@@ -5768,8 +5770,11 @@ xmlValidatePopElement(xmlValidCtxtPtr ctxt, xmlDocPtr doc ATTRIBUTE_UNUSED,
 		if (state->exec != NULL) {
 		    ret = xmlRegExecPushString(state->exec, NULL, NULL);
 		    if (ret <= 0) {
-			xmlErrValidNode(ctxt, state->node,
-			                XML_DTD_CONTENT_MODEL,
+                        if (ret == XML_REGEXP_OUT_OF_MEMORY)
+                            xmlVErrMemory(ctxt);
+                        else
+			    xmlErrValidNode(ctxt, state->node,
+			                    XML_DTD_CONTENT_MODEL,
 	   "Element %s content does not follow the DTD, Expecting more children\n",
 			       state->node->name, NULL,NULL);
 			ret = 0;
diff --git a/xmlregexp.c b/xmlregexp.c
index 9e3b2548..31e3d1a6 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -3500,7 +3500,7 @@ xmlRegFreeExecCtxt(xmlRegExecCtxtPtr exec) {
     xmlFree(exec);
 }
 
-static void
+static int
 xmlRegExecSetErrString(xmlRegExecCtxtPtr exec, const xmlChar *value) {
     if (exec->errString != NULL)
         xmlFree(exec->errString);
@@ -3508,9 +3508,12 @@ xmlRegExecSetErrString(xmlRegExecCtxtPtr exec, const xmlChar *value) {
         exec->errString = NULL;
     } else {
         exec->errString = xmlStrdup(value);
-        if (exec->errString == NULL)
+        if (exec->errString == NULL) {
             exec->status = XML_REGEXP_OUT_OF_MEMORY;
+            return(-1);
+        }
     }
+    return(0);
 }
 
 static void
@@ -3917,7 +3920,8 @@ xmlRegExecPushStringInternal(xmlRegExecCtxtPtr exec, const xmlChar *value,
 		     * entering a sink state, save the current state as error
 		     * state.
 		     */
-                    xmlRegExecSetErrString(exec, value);
+                    if (xmlRegExecSetErrString(exec, value) < 0)
+                        break;
 		    exec->errState = exec->state;
 		    memcpy(exec->errCounts, exec->counts,
 			   exec->comp->nbCounters * sizeof(int));
@@ -3954,7 +3958,8 @@ rollback:
 	    if ((progress) && (exec->state != NULL) &&
 	        (exec->state->type != XML_REGEXP_SINK_STATE)) {
 	        progress = 0;
-                xmlRegExecSetErrString(exec, value);
+                if (xmlRegExecSetErrString(exec, value) < 0)
+                    break;
 		exec->errState = exec->state;
                 if (exec->comp->nbCounters)
                     memcpy(exec->errCounts, exec->counts,