[[ Bug 16294 ]] Fix memory leak in MCCustomPrinter.

runrevmark · runrevmark · commit c4a923464176 · 2015-10-29T13:58:11.000Z
diff --git a/engine/src/customprinter.cpp b/engine/src/customprinter.cpp
@@ -1026,6 +1026,7 @@ static bool dotextmark_callback(void *p_context, const MCTextLayoutSpan *p_span)
 	MCAutoStringRef t_string;
     // SN-2014-06-17 [[ Bug 12595 ]] Not properly causing the bug, but it never hurts to get to use the right encoding
     MCStringCreateWithBytes((byte_t*)p_span->chars, p_span->char_count * 2, kMCStringEncodingUTF16, false, &t_string);
+    
 	byte_t *t_bytes;
 	uindex_t t_byte_count;
 	/* UNCHECKED */ MCStringConvertToBytes(*t_string, kMCStringEncodingUTF8, false, t_bytes, t_byte_count);
@@ -1034,7 +1035,10 @@ static bool dotextmark_callback(void *p_context, const MCTextLayoutSpan *p_span)
 	uint32_t *t_clusters;
 	t_clusters = nil;
 	if (!MCMemoryNewArray(t_byte_count, t_clusters))
+    {
+        MCMemoryDeleteArray(t_bytes);
 		return false;
+    }
 	
 	// Now loop through and build up the cluster array. Notice we keep track of
 	// UTF-16 codepoint index by taking note of leading UTF-8 bytes.
@@ -1099,6 +1103,7 @@ static bool dotextmark_callback(void *p_context, const MCTextLayoutSpan *p_span)
 	t_success = context -> device -> DrawText((const MCCustomPrinterGlyph *)p_span -> glyphs, p_span -> glyph_count, (const char *)t_bytes, t_byte_count, t_clusters, t_font, context -> paint, context -> transform, context -> clip);
 
 	MCMemoryDeleteArray(t_clusters);
+    MCMemoryDeleteArray(t_bytes);
 	
 	return t_success;
 }
