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

trace2: prevent segfault on config collection where no value specified #1814

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

ad-murray
Copy link

@ad-murray ad-murray commented Oct 8, 2024

No description provided.

Copy link

gitgitgadget bot commented Oct 8, 2024

Welcome to GitGitGadget

Hi @ad-murray, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests.

Please make sure that either:

  • Your Pull Request has a good description, if it consists of multiple commits, as it will be used as cover letter.
  • Your Pull Request description is empty, if it consists of a single commit, as the commit message should be descriptive enough by itself.

You can CC potential reviewers by adding a footer to the PR description with the following syntax:

CC: Revi Ewer <[email protected]>, Ill Takalook <[email protected]>

NOTE: DO NOT copy/paste your CC list from a previous GGG PR's description,
because it will result in a malformed CC list on the mailing list. See
example.

Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:

  • the lines should not exceed 76 columns,
  • the first line should be like a header and typically start with a prefix like "tests:" or "revisions:" to state which subsystem the change is about, and
  • the commit messages' body should be describing the "why?" of the change.
  • Finally, the commit messages should end in a Signed-off-by: line matching the commits' author.

It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code.

Contributing the patches

Before you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form /allow. A good way to find other contributors is to locate recent pull requests where someone has been /allowed:

Both the person who commented /allow and the PR author are able to /allow you.

An alternative is the channel #git-devel on the Libera Chat IRC network:

<newcontributor> I've just created my first PR, could someone please /allow me? https://github.com/gitgitgadget/git/pull/12345
<veteran> newcontributor: it is done
<newcontributor> thanks!

Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment /submit.

If you want to see what email(s) would be sent for a /submit request, add a PR comment /preview to have the email(s) sent to you. You must have a public GitHub email address for this. Note that any reviewers CC'd via the list in the PR description will not actually be sent emails.

After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail).

If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the (raw) link), then import it into your mail program. If you use GMail, you can do this via:

curl -g --user "<EMailAddress>:<Password>" \
    --url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txt

To iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description):

Changes since v1:
- Fixed a typo in the commit message (found by ...)
- Added a code comment to ... as suggested by ...
...

To send a new iteration, just add another PR comment with the contents: /submit.

Need help?

New contributors who want advice are encouraged to join [email protected], where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join.

You may also be able to find help in real time in the developer IRC channel, #git-devel on Libera Chat. Remember that IRC does not support offline messaging, so if you send someone a private message and log out, they cannot respond to you. The scrollback of #git-devel is archived, though.

@gitgitgadget gitgitgadget bot added the new user label Oct 8, 2024
Copy link

gitgitgadget bot commented Oct 8, 2024

There are issues in commit 2d4ddcf:
add null check for config value
Commit checks stopped - the message is too short
Commit not signed off

@Haizzz
Copy link

Haizzz commented Oct 8, 2024

/allow ad-murray

Copy link

gitgitgadget bot commented Oct 8, 2024

User ad-murray is now allowed to use GitGitGadget.

WARNING: ad-murray has no public email address set on GitHub;
GitGitGadget needs an email address to Cc: you on your contribution, so that you receive any feedback on the Git mailing list. Go to https://github.com/settings/profile to make your preferred email public to let GitGitGadget know which email address to use.

Copy link

gitgitgadget bot commented Oct 8, 2024

There are issues in commit 976bdf6:
Prevent segfault on trace2 config collection where no value specified
Commit checks stopped - the message is too short
Commit not signed off

@ad-murray ad-murray changed the title add null check for config value Prevent segfault on trace2 config collection where no value specified Oct 8, 2024
@ad-murray ad-murray changed the title Prevent segfault on trace2 config collection where no value specified trace2: prevent segfault on config collection where no value specified Oct 8, 2024
Copy link

gitgitgadget bot commented Oct 8, 2024

There are issues in commit b696097:
trace2: prevent segfault on config collection where no value specified
Commit checks stopped - the message is too short
Commit not signed off

@dscho
Copy link
Member

dscho commented Oct 8, 2024

Commit checks stopped - the message is too short

Please follow the guidance in https://github.blog/2022-06-30-write-better-commits-build-better-projects/ to improve it, in particular with a strong focus on this part:

  What you’re doing Why you’re doing it
High-level (strategic) Intent (what does this accomplish?) Context (why does the code do what it does now?)
Low-level (tactical) Implementation (what did you do to accomplish your goal?) Justification (why is this change being made?)

In this instance, the commit message could explain, for example, why the !strlen(value) condition is needed, i.e. how a non-NULL but still empty value could lead to a segmentation fault and where in the code that would happen.

Commit not signed off

The Git project requires you to "sign off" your work, please amend the commit accordingly and force-push.

Copy link

gitgitgadget bot commented Oct 8, 2024

There are issues in commit 9b505b7:
trace2: prevent segfault on config collection where no value specified
Lines in the body of the commit messages should be wrapped between 60 and 76 characters.
Indented lines, and lines without whitespace, are exempt

When TRACE2 analytics is enabled, a git config option that has no value
causes a segfault.

Steps to Reproduce
GIT_TRACE2=true GIT_TRACE2_CONFIG_PARAMS=status.*
git -c status.relativePaths version
Expected Result
git version 2.46.0
Actual Result
zsh: segmentation fault GIT_TRACE2=true

This adds a null check to prevent the segfault and instead return
the "empty config value" error.

Signed-off-by: Adam Murray <[email protected]>
Copy link

gitgitgadget bot commented Oct 8, 2024

There are issues in commit 48ffb81:
trace2: prevent segfault on config collection where no value specified
Lines in the body of the commit messages should be wrapped between 60 and 76 characters.
Indented lines, and lines without whitespace, are exempt

@ad-murray
Copy link
Author

Commit checks stopped - the message is too short

Please follow the guidance in https://github.blog/2022-06-30-write-better-commits-build-better-projects/ to improve it, in particular with a strong focus on this part:

  What you’re doing Why you’re doing it
High-level (strategic) Intent (what does this accomplish?) Context (why does the code do what it does now?)
Low-level (tactical) Implementation (what did you do to accomplish your goal?) Justification (why is this change being made?)
In this instance, the commit message could explain, for example, why the !strlen(value) condition is needed, i.e. how a non-NULL but still empty value could lead to a segmentation fault and where in the code that would happen.

Commit not signed off

The Git project requires you to "sign off" your work, please amend the commit accordingly and force-push.

Commit message updated, is there a way to re-run the failing checks?

@dscho
Copy link
Member

dscho commented Oct 10, 2024

is there a way to re-run the failing checks?

Well, those checks fail because the patch introduces a regression. In particular t1300.131 documents that git -c foo.flag config --bool foo.flag should return true, not an error.

Speaking of test cases: You described one in the commit message. How about moving it from the commit message into an actual test script, to verify that the described regression is fixed (and to prevent future regressions going unnoticed)? t0210-trace2-normal.sh would make for a fine home for that test case.

As to the fix for the segmentation fault: I think this diff, or a variation thereof, should be the correct fix:

diff --git a/trace2.c b/trace2.c
index f894532d0533..6cae41ca61c4 100644
--- a/trace2.c
+++ b/trace2.c
@@ -259,7 +259,7 @@ static const char *redact_arg(const char *arg)
 	const char *p, *colon;
 	size_t at;
 
-	if (!trace2_redact ||
+	if (!trace2_redact || !arg ||
 	    (!skip_prefix(arg, "https://", &p) &&
 	     !skip_prefix(arg, "http://", &p)))
 		return arg;

@ad-murray
Copy link
Author

right you are, will do

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants