Commit ddc9e79ae2acf6afa9262909649b2984e1b3ff1a
2011-02-02T06:16:50
Fix more issues with Win32 EOL Signed-off-by: Vicent Marti <tanoku@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/src/refs.c b/src/refs.c
index 40c47f2..eca50dd 100644
--- a/src/refs.c
+++ b/src/refs.c
@@ -95,7 +95,7 @@ int git_reference_new(git_reference **ref_out, git_repository *repo)
static int parse_sym_ref(git_reference *ref, gitfo_buf *file_content)
{
- const int header_len = strlen(GIT_SYMREF);
+ const unsigned int header_len = strlen(GIT_SYMREF);
const char *refname_start;
char *eol;
@@ -318,10 +318,6 @@ static int parse_packed_line(
goto cleanup;
}
- /* windows line feeds */
- if (refname_end[-1] == '\r')
- refname_end--;
-
refname_len = refname_end - refname_begin;
ref->name = git__malloc(refname_len + 1);
@@ -333,6 +329,9 @@ static int parse_packed_line(
memcpy(ref->name, refname_begin, refname_len);
ref->name[refname_len] = 0;
+ if (ref->name[refname_len - 1] == '\r')
+ ref->name[refname_len - 1] = 0;
+
ref->type = GIT_REF_OID;
ref->packed = 1;
@@ -368,6 +367,14 @@ static int parse_packed_refs(git_refcache *ref_cache, git_repository *repo)
/* Let's skip the header */
buffer_start += strlen(GIT_PACKEDREFS_HEADER);
+ if (*buffer_start == '\r')
+ buffer_start++;
+
+ if (*buffer_start != '\n')
+ return GIT_EPACKEDREFSCORRUPTED;
+
+ buffer_start++;
+
while (buffer_start < buffer_end) {
git_reference *ref = NULL;
diff --git a/src/refs.h b/src/refs.h
index f19d878..3b6d567 100644
--- a/src/refs.h
+++ b/src/refs.h
@@ -11,7 +11,7 @@
#define GIT_SYMREF "ref: "
#define GIT_PACKEDREFS_FILE "packed-refs"
-#define GIT_PACKEDREFS_HEADER "# pack-refs with: peeled \n"
+#define GIT_PACKEDREFS_HEADER "# pack-refs with: peeled "
#define MAX_GITDIR_TREE_STRUCTURE_PATH_LENGTH 100
struct git_reference {