From eabc718099623b14146b7be421cf3bcb88ae6e62 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Mon, 15 Nov 2010 17:16:08 -0500 Subject: [PATCH] Preprocessor: Don't push predefined macro null terminator to the include stack. --- mojoshader_preprocessor.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mojoshader_preprocessor.c b/mojoshader_preprocessor.c index 8e34326a..f79c6352 100644 --- a/mojoshader_preprocessor.c +++ b/mojoshader_preprocessor.c @@ -665,10 +665,11 @@ Preprocessor *preprocessor_start(const char *fname, const char *source, if ((okay) && (!push_source(ctx,fname,source,sourcelen,1,NULL))) okay = 0; - if ((okay) && (define_include != NULL)) + if ((okay) && (define_include_len > 0)) { + assert(define_include != NULL); okay = push_source(ctx, "", define_include, - define_include_len, 1, close_define_include); + define_include_len-1, 1, close_define_include); } // if if (!okay)