lf_to_crlf(): NUL-terminate msg_data::data

Through the rest of the file, the data member of struct msg_data is
kept NUL-terminated, and that fact is relied upon in a couple of
places.  Change lf_to_crlf() to preserve this invariant.

In fact, there are no execution paths in which lf_to_crlf() is called
and then its data member is required to be NUL-terminated, but it is
better to be consistent to prevent future confusion.

Document the invariant in the struct msg_data definition.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael Haggerty 2012-11-25 12:08:36 +01:00 committed by Junio C Hamano
parent 37141f27d8
commit 32a8569ecf
1 changed files with 6 additions and 1 deletions

View File

@ -69,8 +69,12 @@ struct store {
}; };


struct msg_data { struct msg_data {
/* NUL-terminated data: */
char *data; char *data;

/* length of data (not including NUL): */
int len; int len;

unsigned char flags; unsigned char flags;
}; };


@ -1276,7 +1280,7 @@ static void lf_to_crlf(struct msg_data *msg)
lfnum++; lfnum++;
} }


new = xmalloc(msg->len + lfnum); new = xmalloc(msg->len + lfnum + 1);
if (msg->data[0] == '\n') { if (msg->data[0] == '\n') {
new[0] = '\r'; new[0] = '\r';
new[1] = '\n'; new[1] = '\n';
@ -1297,6 +1301,7 @@ static void lf_to_crlf(struct msg_data *msg)
/* otherwise it already had CR before */ /* otherwise it already had CR before */
new[j++] = '\n'; new[j++] = '\n';
} }
new[j] = '\0';
msg->len += lfnum; msg->len += lfnum;
free(msg->data); free(msg->data);
msg->data = new; msg->data = new;