From 7a19260f5e4cebeaf927da46c54e1dbedcde2e36 Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Tue, 3 Feb 2009 17:16:56 -0500
Subject: [PATCH] Handle out of memory error better.

---
 mojoshader_assembler.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/mojoshader_assembler.c b/mojoshader_assembler.c
index 68446cf0..0cca0be2 100644
--- a/mojoshader_assembler.c
+++ b/mojoshader_assembler.c
@@ -1779,10 +1779,12 @@ static MOJOSHADER_error *build_errors(Context *ctx)
 
 static const MOJOSHADER_parseData *build_failed_assembly(Context *ctx)
 {
-    MOJOSHADER_parseData *retval = NULL;
-    if (!isfail(ctx))
-        return NULL;
+    assert(isfail(ctx));
 
+    if (ctx->out_of_memory)
+        return &out_of_mem_data;
+        
+    MOJOSHADER_parseData *retval = NULL;
     retval = (MOJOSHADER_parseData*) Malloc(ctx, sizeof(MOJOSHADER_parseData));
     if (retval == NULL)
         return &out_of_mem_data;