git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eric Sunshine <sunshine@sunshineco.com>
To: Stefan Beller <sbeller@google.com>
Cc: Junio C Hamano <gitster@pobox.com>, Git List <git@vger.kernel.org>
Subject: Re: [PATCH 2/6] imap-send.c, cram: allocate enough memory for null terminated string
Date: Tue, 29 Mar 2016 21:02:15 -0400	[thread overview]
Message-ID: <CAPig+cSX4Jye60CKxR=OjhtAai09WSMNMOau2WHUxgXbKX2aDQ@mail.gmail.com> (raw)
In-Reply-To: <1459298333-21899-3-git-send-email-sbeller@google.com>

On Tue, Mar 29, 2016 at 8:38 PM, Stefan Beller <sbeller@google.com> wrote:
> `strlen` returns the length of a string without the terminating null byte.
> To make sure enough memory is allocated we need to pass `strlen(..) + 1`
> to the allocation function.
>
> Signed-off-by: Stefan Beller <sbeller@google.com>
> ---
>  imap-send.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/imap-send.c b/imap-send.c
> index 2c52027..f7e9909 100644
> --- a/imap-send.c
> +++ b/imap-send.c
> @@ -872,7 +872,7 @@ static char *cram(const char *challenge_64, const char *user, const char *pass)
>          * enough upper bound for challenge (decoded result).
>          */
>         encoded_len = strlen(challenge_64);
> -       challenge = xmalloc(encoded_len);
> +       challenge = xmalloc(encoded_len + 1);

'challenge' is never used as a NUL-terminated string, and
EVP_DecodeBlock() is not advertised as adding a terminating NUL, so
why is this an improvement?

>         decoded_len = EVP_DecodeBlock((unsigned char *)challenge,
>                                       (unsigned char *)challenge_64, encoded_len);
>         if (decoded_len < 0)
> --

  reply	other threads:[~2016-03-30  1:02 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-30  0:38 [PATCH 0/6] Some cleanups Stefan Beller
2016-03-30  0:38 ` [PATCH 1/6] path.c: allocate enough memory for string Stefan Beller
2016-03-30  0:56   ` Junio C Hamano
2016-03-30  0:57   ` Eric Sunshine
2016-03-30 16:41     ` Stefan Beller
2016-03-30 17:16       ` Junio C Hamano
2016-03-30  0:38 ` [PATCH 2/6] imap-send.c, cram: allocate enough memory for null terminated string Stefan Beller
2016-03-30  1:02   ` Eric Sunshine [this message]
2016-03-30  1:07   ` Jeff King
2016-03-30  0:38 ` [PATCH 3/6] notes: don't leak memory in git_config_get_notes_strategy Stefan Beller
2016-03-30  1:11   ` Eric Sunshine
2016-03-30  1:13   ` Jeff King
2016-03-30 17:17     ` Junio C Hamano
2016-03-30  0:38 ` [PATCH 4/6] abbrev_sha1_in_line: don't leak memory Stefan Beller
2016-03-30  1:11   ` Jeff King
2016-03-30  1:30     ` Eric Sunshine
2016-03-30  1:31       ` Jeff King
2016-03-30 17:06         ` Junio C Hamano
2016-03-30 17:21           ` Jeff King
2016-03-30  0:38 ` [PATCH 5/6] bundle: don't leak an fd in case of early return Stefan Beller
2016-03-30  1:17   ` Jeff King
2016-03-30 17:19     ` Junio C Hamano
2016-03-30  0:38 ` [PATCH 6/6] credential-cache, send_request: close fd when done Stefan Beller
2016-03-30  1:20   ` Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAPig+cSX4Jye60CKxR=OjhtAai09WSMNMOau2WHUxgXbKX2aDQ@mail.gmail.com' \
    --to=sunshine@sunshineco.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=sbeller@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).