Skip to content

Commit

Permalink
p4merge: fix printf usage
Browse files Browse the repository at this point in the history
Do not use a random string as if it is a format string for printf
when showing it literally; instead feed it to '%s' format.

Reported-by: Asheesh Laroia <asheesh@asheesh.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
David Aguilar authored and Junio C Hamano committed Feb 10, 2013
1 parent 950b568 commit d272c84
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mergetools/p4merge
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ create_empty_file () {
empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$"
>"$empty_file"

printf "$empty_file"
printf "%s" "$empty_file"
}

0 comments on commit d272c84

Please sign in to comment.