fix(hmpl): memory leak
This commit is contained in:
@@ -2,64 +2,9 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
//#include "libhmpl.h"
|
||||
#include "chectic.h"
|
||||
#include "cjson/cJSON.h"
|
||||
|
||||
#define KB128 131072
|
||||
|
||||
// CREATE OR REPLACE FUNCTION common.render_template_placeholders(result TEXT, context JSONB, prefix CHAR(1) DEFAULT '')
|
||||
// RETURNS text LANGUAGE plpgsql AS $$
|
||||
// DECLARE
|
||||
// simple_start INT;
|
||||
// simple_end INT;
|
||||
// simple_key TEXT;
|
||||
// replacement TEXT;
|
||||
// first_char CHAR(1);
|
||||
// _offset INT := 0;
|
||||
//
|
||||
// start_pattern CHAR(3);
|
||||
// start_pattern_length INT;
|
||||
// BEGIN
|
||||
// start_pattern = '{{' || prefix;
|
||||
// start_pattern_length = char_length(start_pattern);
|
||||
//
|
||||
// LOOP
|
||||
// -- Locate the start of the simple key marker.
|
||||
// simple_start := strpos(substring(result from _offset), start_pattern);
|
||||
// EXIT WHEN simple_start = 0; -- Exit if no simple marker is found.
|
||||
//
|
||||
// IF _offset != 0 THEN
|
||||
// simple_start := _offset + simple_start - 1;
|
||||
// END IF;
|
||||
//
|
||||
// -- Locate the end of the simple key marker.
|
||||
// simple_end := strpos(result, '}}', simple_start);
|
||||
// IF simple_end = 0 THEN
|
||||
// RAISE EXCEPTION 'Malformed template: missing closing braces for loop start';
|
||||
// END IF;
|
||||
//
|
||||
// simple_key := substring(result from simple_start + start_pattern_length for simple_end - simple_start - start_pattern_length);
|
||||
//
|
||||
//
|
||||
// replacement := eval_value(context, simple_key);
|
||||
// RAISE LOG '% := eval_value(%, %)', replacement, context, simple_key;
|
||||
// IF replacement IS NULL THEN
|
||||
// _offset := simple_start + start_pattern_length;
|
||||
// RAISE LOG '% := % + %', _offset, simple_start, start_pattern_length;
|
||||
// IF _offset = 0 THEN
|
||||
// RAISE EXCEPTION 'Malformed template: offset cannot be 0';
|
||||
// END IF;
|
||||
// CONTINUE;
|
||||
// END IF;
|
||||
// result := replace(
|
||||
// result,
|
||||
// substring(result from simple_start for simple_end - simple_start + 2),
|
||||
// replacement);
|
||||
// END LOOP;
|
||||
//
|
||||
// RETURN result;
|
||||
// END $$;
|
||||
char *eval(cJSON *context, const char *key) {
|
||||
if (!context || !key) return NULL;
|
||||
char *key_copy = strdup(key);
|
||||
@@ -86,7 +31,7 @@ char *eval(cJSON *context, const char *key) {
|
||||
}
|
||||
|
||||
void substring(const char *src, char *dest, size_t start, size_t len) {
|
||||
raise_debug("substring %s from %d to %d", src, start, len);
|
||||
raise_debug("substring %s from %zu to %zu", src, start, len);
|
||||
size_t srclen = strlen(src);
|
||||
if (start >= srclen) {
|
||||
dest[0] = '\0';
|
||||
@@ -114,51 +59,54 @@ char* replace_substring(const char* src, int start, int end, const char* replace
|
||||
return new_str;
|
||||
}
|
||||
|
||||
void render_template_placeholders(char *text, cJSON *context, char prefix[1]) {
|
||||
/* Modified: text is passed by reference so we can update it and free old allocations */
|
||||
void render_template_placeholders(char **text_ptr, cJSON *context, const char *prefix) {
|
||||
raise_debug("render_template_placeholders");
|
||||
// start
|
||||
char start_pattern[4];
|
||||
sprintf(&start_pattern[0], "{{%s", prefix);
|
||||
|
||||
char start_pattern[256];
|
||||
snprintf(start_pattern, sizeof(start_pattern), "{{%s", prefix);
|
||||
int start_pattern_length = strlen(start_pattern);
|
||||
int offset = 0;
|
||||
|
||||
while (1) {
|
||||
// find tag start
|
||||
char *placeholder_start = strstr(text + offset, start_pattern);
|
||||
if (!placeholder_start) { break; }
|
||||
char *releative_start = (size_t)placeholder_start - (size_t)text + start_pattern_length;
|
||||
raise_debug("start: %d", releative_start);
|
||||
|
||||
if (offset != 0) {
|
||||
placeholder_start += offset - 1;
|
||||
}
|
||||
char *current_text = *text_ptr;
|
||||
char *placeholder_start = strstr(current_text + offset, start_pattern);
|
||||
if (!placeholder_start)
|
||||
break;
|
||||
int start_index = placeholder_start - current_text;
|
||||
int key_start = start_index + start_pattern_length;
|
||||
raise_debug("start: %d", key_start);
|
||||
|
||||
char *placeholder_end = strstr(placeholder_start, "}}");
|
||||
// TODO: user error instead exaption
|
||||
if (!placeholder_end) { raise_exception("Malformed template: missing closing braces for placeholder start"); };
|
||||
raise_debug("end: %d", (size_t)placeholder_end - (size_t)text);
|
||||
|
||||
int len = (size_t)placeholder_end - (size_t)placeholder_start - start_pattern_length;
|
||||
char* placeholder_key = malloc(len + 1);;
|
||||
substring(text, placeholder_key, releative_start, len);
|
||||
if (!placeholder_end) {
|
||||
raise_exception("Malformed template: missing closing braces for placeholder start");
|
||||
}
|
||||
int key_length = (placeholder_end - current_text) - key_start;
|
||||
char *placeholder_key = malloc(key_length + 1);
|
||||
if (!placeholder_key)
|
||||
raise_exception("Memory allocation error");
|
||||
substring(current_text, placeholder_key, key_start, key_length);
|
||||
raise_debug("key: %s", placeholder_key);
|
||||
|
||||
char *replacement = eval(context, placeholder_key);
|
||||
raise_debug("%s = eval(%s, %s)", replacement, context, placeholder_key);
|
||||
raise_debug("%s = eval(context, %s)", replacement ? replacement : "NULL", placeholder_key);
|
||||
free(placeholder_key);
|
||||
if (!replacement) {
|
||||
offset = placeholder_start + start_pattern_length;
|
||||
raise_log("offset is %s = %s + %s", offset, placeholder_start, start_pattern_length);
|
||||
if (offset = 0) {
|
||||
raise_exception("offset cannot be 0 here");
|
||||
};
|
||||
offset = (placeholder_end - current_text) + 2; // skip past the placeholder
|
||||
continue;
|
||||
}
|
||||
text = replace_substring(text, releative_start - start_pattern_length, releative_start + len + 2 - 1, replacement);
|
||||
raise_info(text);
|
||||
};
|
||||
int placeholder_end_index = (placeholder_end - current_text) + 2; // include "}}"
|
||||
|
||||
char *new_text =
|
||||
replace_substring(current_text, start_index, placeholder_end_index - 1, replacement);
|
||||
free(replacement);
|
||||
free(current_text); // free the old text
|
||||
|
||||
*text_ptr = new_text;
|
||||
offset = start_index; // resume search from the replaced location
|
||||
}
|
||||
}
|
||||
|
||||
void render_template(char *text, cJSON *context) {
|
||||
void render_template(char **text, cJSON *context) {
|
||||
render_template_placeholders(text, context, "");
|
||||
}
|
||||
|
||||
@@ -167,7 +115,12 @@ int main(int argc, char *argv[]) {
|
||||
raise_info("start");
|
||||
|
||||
char *text = NULL;
|
||||
cJSON *context = cJSON_Parse(strdup(argc > 1 ? argv[1] : "{}"));
|
||||
const char *json_input = (argc > 1 ? argv[1] : "{}");
|
||||
cJSON *context = cJSON_Parse(json_input);
|
||||
if (!context) {
|
||||
fprintf(stderr, "Error parsing JSON\n");
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (argc > 2) {
|
||||
text = strdup(argv[2]);
|
||||
@@ -176,18 +129,17 @@ int main(int argc, char *argv[]) {
|
||||
ssize_t len = getdelim(&text, &size, '\0', stdin);
|
||||
if (len < 0) {
|
||||
perror("read stdin");
|
||||
free(context);
|
||||
cJSON_Delete(context);
|
||||
return 1;
|
||||
}
|
||||
} else {
|
||||
text = strdup("");
|
||||
}
|
||||
|
||||
if (text) {
|
||||
render_template(text, context);
|
||||
}
|
||||
|
||||
render_template(&text, context);
|
||||
printf("%s", text);
|
||||
|
||||
free(text);
|
||||
free(context);
|
||||
cJSON_Delete(context);
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user