diff mbox series

osx-keychain: fix compiler warning

Message ID pull.1293.git.1658251503775.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit f2fc531585215d02a75a4d1ce7e6964e9eb21812
Headers show
Series osx-keychain: fix compiler warning | expand

Commit Message

Lessley Dennington July 19, 2022, 5:25 p.m. UTC
From: Lessley Dennington <lessleydennington@gmail.com>

Update git-credential-osxkeychain.c to remove 'format string is not a string
literal (potentially insecure)' compiler warning by treating the string as
an argument.

Signed-off-by: Lessley Dennington <lessleydennington@gmail.com>
---
    osx-keychain: fix compiler warning
    
    Running make in contrib/credential/osxkeychain currently shows the
    following warning:
    
    warning: format string is not a string literal (potentially insecure)
    
    This small change to treat the string as an argument fixes the issue.
    
    Thanks, Lessley

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1293%2Fldennington%2Ffix-osx-keychain-warning-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1293/ldennington/fix-osx-keychain-warning-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1293

 contrib/credential/osxkeychain/git-credential-osxkeychain.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


base-commit: 71a8fab31b70c417e8f5b5f716581f89955a7082

Comments

Derrick Stolee July 19, 2022, 5:30 p.m. UTC | #1
On 7/19/2022 1:25 PM, Lessley Dennington via GitGitGadget wrote:
> From: Lessley Dennington <lessleydennington@gmail.com>
> 
> Update git-credential-osxkeychain.c to remove 'format string is not a string
> literal (potentially insecure)' compiler warning by treating the string as
> an argument.

>  	if (!argv[1])
> -		die(usage);
> +		die("%s", usage);

Thanks for preparing this for upstream. I reviewed this change as we
were doing related things in the microsoft/git fork. LGTM here, too.

Thanks,
-Stolee
Junio C Hamano July 19, 2022, 6:24 p.m. UTC | #2
"Lessley Dennington via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> From: Lessley Dennington <lessleydennington@gmail.com>
>
> Update git-credential-osxkeychain.c to remove 'format string is not a string
> literal (potentially insecure)' compiler warning by treating the string as
> an argument.
>
> Signed-off-by: Lessley Dennington <lessleydennington@gmail.com>
> ---

Perfect.  Thanks.  Will queue.

> @@ -168,7 +168,7 @@ int main(int argc, const char **argv)
>  		"usage: git credential-osxkeychain <get|store|erase>";
>  
>  	if (!argv[1])
> -		die(usage);
> +		die("%s", usage);
>  
>  	read_credential();
>  
>
> base-commit: 71a8fab31b70c417e8f5b5f716581f89955a7082
Glen Choo July 19, 2022, 6:29 p.m. UTC | #3
"Lessley Dennington via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Lessley Dennington <lessleydennington@gmail.com>
>
> Update git-credential-osxkeychain.c to remove 'format string is not a string
> literal (potentially insecure)' compiler warning by treating the string as
> an argument.
>
> Signed-off-by: Lessley Dennington <lessleydennington@gmail.com>
> ---
>     osx-keychain: fix compiler warning
>     
>     Running make in contrib/credential/osxkeychain currently shows the
>     following warning:
>     
>     warning: format string is not a string literal (potentially insecure)
>     
>     This small change to treat the string as an argument fixes the issue.
>     
>     Thanks, Lessley

Thanks! I literally just ran into this warning, and it's been already
fixed :)

>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1293%2Fldennington%2Ffix-osx-keychain-warning-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1293/ldennington/fix-osx-keychain-warning-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/1293
>
>  contrib/credential/osxkeychain/git-credential-osxkeychain.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
> index 0b44a9b7cc6..bf77748d602 100644
> --- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c
> +++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
> @@ -168,7 +168,7 @@ int main(int argc, const char **argv)
>  		"usage: git credential-osxkeychain <get|store|erase>";
>  
>  	if (!argv[1])
> -		die(usage);
> +		die("%s", usage);
>  
>  	read_credential();

Looks good!

>  
>
> base-commit: 71a8fab31b70c417e8f5b5f716581f89955a7082
> -- 
> gitgitgadget
diff mbox series

Patch

diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
index 0b44a9b7cc6..bf77748d602 100644
--- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c
+++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c
@@ -168,7 +168,7 @@  int main(int argc, const char **argv)
 		"usage: git credential-osxkeychain <get|store|erase>";
 
 	if (!argv[1])
-		die(usage);
+		die("%s", usage);
 
 	read_credential();