diff options
| -rw-r--r-- | src/template.c | 123 |
1 files changed, 89 insertions, 34 deletions
diff --git a/src/template.c b/src/template.c index 8f0f22b..96c59e6 100644 --- a/src/template.c +++ b/src/template.c @@ -1,5 +1,6 @@ #include "../beaker.h" #include "beaker_globals.h" +#include <ctype.h> #include <errno.h> #include <stdbool.h> #include <stdio.h> @@ -402,7 +403,7 @@ static char *html_escape(const char *input) { } output = new_output; } - strncat(output, replacement, estimated_len - current_output_len - 1); + strcat(output, replacement); current_output_len += repl_len; } else { @@ -456,7 +457,7 @@ static void append_to_buffer(char **buffer, size_t *current_len, *buffer = new_buffer; } - strncat(*buffer, str_to_add, *max_len - *current_len - 1); + strcat(*buffer, str_to_add); *current_len += add_len; } @@ -758,6 +759,45 @@ static Condition parse_condition(const char *condition_str) { return cond; } +static bool parse_for_tag(const char *tag, char loop_var[MAX_KEY_LEN], + char list_var[MAX_KEY_LEN]) { + const char *cursor = tag + 3; + while (isspace((unsigned char)*cursor)) + cursor++; + + const char *loop_start = cursor; + while (*cursor != '\0' && !isspace((unsigned char)*cursor)) + cursor++; + size_t loop_len = (size_t)(cursor - loop_start); + if (loop_len == 0 || loop_len >= MAX_KEY_LEN) + return false; + + while (isspace((unsigned char)*cursor)) + cursor++; + if (strncmp(cursor, "in", 2) != 0 || !isspace((unsigned char)cursor[2])) + return false; + cursor += 2; + while (isspace((unsigned char)*cursor)) + cursor++; + + const char *list_start = cursor; + while (*cursor != '\0' && !isspace((unsigned char)*cursor)) + cursor++; + size_t list_len = (size_t)(cursor - list_start); + if (list_len == 0 || list_len >= MAX_KEY_LEN) + return false; + while (isspace((unsigned char)*cursor)) + cursor++; + if (*cursor != '\0') + return false; + + memcpy(loop_var, loop_start, loop_len); + loop_var[loop_len] = '\0'; + memcpy(list_var, list_start, list_len); + list_var[list_len] = '\0'; + return true; +} + static char *render_template_segment(const char *template_segment, TemplateContext *ctx) { size_t initial_max_len = BUFFER_SIZE; @@ -837,20 +877,20 @@ static char *render_template_segment(const char *template_segment, *(end_trimmed + 1) = '\0'; } - if (strncmp(trimmed_tag_content, "for ", 4) == 0) { + if (strncmp(trimmed_tag_content, "for", 3) == 0 && + (trimmed_tag_content[3] == '\0' || + isspace((unsigned char)trimmed_tag_content[3]))) { char loop_var[MAX_KEY_LEN]; char list_var[MAX_KEY_LEN]; - if (sscanf(trimmed_tag_content, "for %63s in %63s", loop_var, list_var) == - 2) { + if (parse_for_tag(trimmed_tag_content, loop_var, list_var)) { ContextVar *list_ctx_var = find_context_var(ctx, list_var); const char *loop_end_tag = strstr(end_tag + 2, "{{endfor}}"); if (loop_end_tag == NULL) { - append_to_buffer(&rendered_buffer, ¤t_len, &max_len, - trimmed_tag_content); + beaker_log("ERROR", "render_template_segment: Unclosed 'for' loop."); free(tag_content_raw); - current_pos = end_tag + 2; - continue; + free(rendered_buffer); + return NULL; } if (list_ctx_var != NULL) { @@ -906,11 +946,16 @@ static char *render_template_segment(const char *template_segment, char *rendered_loop_item = render_template_segment(loop_inner_template, &loop_ctx); - if (rendered_loop_item) { - append_to_buffer(&rendered_buffer, ¤t_len, &max_len, - rendered_loop_item); - free(rendered_loop_item); + if (rendered_loop_item == NULL) { + free_context(&loop_ctx); + free(loop_inner_template); + free(tag_content_raw); + free(rendered_buffer); + return NULL; } + append_to_buffer(&rendered_buffer, ¤t_len, &max_len, + rendered_loop_item); + free(rendered_loop_item); free_context(&loop_ctx); } } else if (list_ctx_var->type == CONTEXT_TYPE_STRING_ARRAY) { @@ -930,11 +975,16 @@ static char *render_template_segment(const char *template_segment, char *rendered_loop_item = render_template_segment(loop_inner_template, &loop_ctx); - if (rendered_loop_item) { - append_to_buffer(&rendered_buffer, ¤t_len, &max_len, - rendered_loop_item); - free(rendered_loop_item); + if (rendered_loop_item == NULL) { + free_context(&loop_ctx); + free(loop_inner_template); + free(tag_content_raw); + free(rendered_buffer); + return NULL; } + append_to_buffer(&rendered_buffer, ¤t_len, &max_len, + rendered_loop_item); + free(rendered_loop_item); free_context(&loop_ctx); } } else { @@ -961,9 +1011,12 @@ static char *render_template_segment(const char *template_segment, } else { beaker_log( "ERROR", - "render_template_segment: Malformed 'for' loop tag: " - "'%s'. Expected 'for var in list'. Appending loop tag as-is.\n", - trimmed_tag_content); + "render_template_segment: Invalid 'for' loop tag. Expected " + "'for var in list' with identifiers shorter than %d bytes.", + MAX_KEY_LEN); + free(tag_content_raw); + free(rendered_buffer); + return NULL; } } @@ -1120,11 +1173,15 @@ static char *render_template_segment(const char *template_segment, block_template[block_len] = '\0'; char *rendered_block = render_template_segment(block_template, ctx); - if (rendered_block != NULL) { - append_to_buffer(&rendered_buffer, ¤t_len, &max_len, - rendered_block); - free(rendered_block); + if (rendered_block == NULL) { + free(block_template); + free(tag_content_raw); + free(rendered_buffer); + return NULL; } + append_to_buffer(&rendered_buffer, ¤t_len, &max_len, + rendered_block); + free(rendered_block); free(block_template); } } @@ -1185,22 +1242,20 @@ static char *render_template_segment(const char *template_segment, } char *included_html = render_template(included_filename, ctx); - if (included_html) { - append_to_buffer(&rendered_buffer, ¤t_len, &max_len, - included_html); - free(included_html); - } else { + if (included_html == NULL) { beaker_log("WARN", "render_template_segment: Failed to render " "included template '%s'.\n", included_filename); - append_to_buffer(&rendered_buffer, ¤t_len, &max_len, - "<!-- Failed to include "); - append_to_buffer(&rendered_buffer, ¤t_len, &max_len, - included_filename); - append_to_buffer(&rendered_buffer, ¤t_len, &max_len, " -->"); + free(included_filename); + free(tag_content_raw); + free(rendered_buffer); + return NULL; } + append_to_buffer(&rendered_buffer, ¤t_len, &max_len, + included_html); + free(included_html); free(included_filename); current_pos = end_tag + 2; free(tag_content_raw); |
