Skip to content

PATCH: ast_variable_update() does not play well with templates #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 29, 2024
Merged

PATCH: ast_variable_update() does not play well with templates #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions patches/config_c_fix_template_writing.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff --git a/main/config.c b/main/config.c
index e7ac4149a6..e81d3afced 100644
--- a/main/config.c
+++ b/main/config.c
@@ -1533,13 +1533,19 @@ int ast_variable_delete(struct ast_category *category, const char *variable, con
int ast_variable_update(struct ast_category *category, const char *variable,
const char *value, const char *match, unsigned int object)
{
- struct ast_variable *cur, *prev=NULL, *newer=NULL;
+ struct ast_variable *cur, *prev=NULL, *newer=NULL, *matchvar = NULL;

for (cur = category->root; cur; prev = cur, cur = cur->next) {
if (strcasecmp(cur->name, variable) ||
(!ast_strlen_zero(match) && strcasecmp(cur->value, match)))
continue;
+ matchvar = cur;
+ }

+ for (cur = category->root; cur; prev = cur, cur = cur->next) {
+ if (cur != matchvar) {
+ continue;
+ }
if (!(newer = ast_variable_new(variable, value, cur->file)))
return -1;

1 change: 1 addition & 0 deletions phreaknet.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1929,6 +1929,7 @@ phreak_patches() { # $1 = $PATCH_DIR, $2 = $AST_SRC_DIR

## Unmerged patches: remove once merged
git_patch "config_c_fix_template_inheritance_overrides.patch" # config.c: fix template inheritance/overrides
git_patch "config_c_fix_template_writing.patch" # config.c: fix template inheritance/overrides

if [ $AST_MAJOR_VER -lt 21 ]; then
if [ "$EXTERNAL_CODECS" = "1" ]; then
Expand Down