Skip to content
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.

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

Only remove a delimiterin macro expansion if a delimiter was found #43

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion src/libspf2/spf_expand.c
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,13 @@ SPF_record_expand_data(SPF_server_t *spf_server,
break;
p_write--;
}
p_write++; /* Move to just after the '.' */
/* Move to just after the '.', but only if we have found at least
* one '.' in the string. For a string without any delimiter
* inside there is no '.' to remove, otherwise we would remove a
* character from the payload */
if (num_found != 0) {
p_write++;
}
/* This moves the '\0' as well. */
len = p_read_end - p_write;
memmove(munged_var, p_write, len + 1);
Expand Down