@@ -4034,7 +4034,7 @@ static int cli_loadyara(FILE *fs, struct cl_engine *engine, unsigned int *signo,

 #ifdef YARA_FINISHED

         return CL_EMALFDB;

 #else

-        if (rc == ERROR_INSUFICIENT_MEMORY)

+        if (compiler.last_result == ERROR_INSUFICIENT_MEMORY)

             return CL_EMEM;

         return CL_SUCCESS;

 #endif

@@ -2945,8 +2945,10 @@ void yyfatal(

     const char *error_message)

 {

   YR_COMPILER* compiler = yara_yyget_extra(yyscanner);

+  int last_result = compiler->last_result;

   yyerror(yyscanner, compiler, error_message);

+  compiler->last_result = last_result;

   longjmp(compiler->error_recovery, 1);

 }

@@ -611,8 +611,10 @@ void yyfatal(

     const char *error_message)

 {

   YR_COMPILER* compiler = yyget_extra(yyscanner);

+  int last_result = compiler->last_result;

   yyerror(yyscanner, compiler, error_message);

+  compiler->last_result = last_result;

   longjmp(compiler->error_recovery, 1);

 }