diff options
| author | Adam Hess <[email protected]> | 2023-11-06 22:46:42 -0800 |
|---|---|---|
| committer | Peter Zhu <[email protected]> | 2023-11-08 08:05:58 -0500 |
| commit | f694bd158c4aaffbbb9e4b2f0608c6d428a4999c () | |
| tree | 70b19ea21ca94af9a889126a4166638390cc7b42 /regparse.c | |
| parent | 05cde4155cd43a79733ab4996db2d8b1f64c4fb5 (diff) | |
Improve error and memory handling
Apply Nobu's suggestions which improve style, memory handling and error correction. Co-authored-by: Nobuyoshi Nakada <[email protected]>
| -rw-r--r-- | regparse.c | 27 |
1 files changed, 22 insertions, 5 deletions
@@ -557,21 +557,34 @@ copy_named_captures_iter(const OnigUChar *name, const OnigUChar *name_end, { NameTable *copy_table = (NameTable *)arg; NameEntry *entry_copy = (NameEntry* )xmalloc(sizeof(NameEntry)); entry_copy->name_len = name_end - name; entry_copy->back_num = back_num; entry_copy->back_alloc = back_num; entry_copy->back_ref1 = back_refs[0]; entry_copy->back_refs = xmalloc(back_num * (sizeof(int*))); - for (int i = 0; i < back_num; i++) { - entry_copy->back_refs[i] = back_refs[i]; } UChar *new_name = strdup_with_null(regex->enc, name, name_end); entry_copy->name = new_name; - onig_st_insert_strend(copy_table, new_name, (new_name + entry_copy->name_len), (hash_data_type)entry_copy); - return ST_CONTINUE; } extern int @@ -580,7 +593,11 @@ onig_names_copy(regex_t* reg, regex_t* oreg) NameTable* table = oreg->name_table; if (table) { NameTable * t = onig_st_init_strend_table_with_size(onig_number_of_names(oreg)); - onig_foreach_name(oreg, copy_named_captures_iter, (void*)t); reg->name_table = t; } return 0; |