summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorScott J. Goldman <scottjg@github.com>2013-06-02 02:16:05 -0700
committerScott J. Goldman <scottjg@github.com>2013-06-02 02:16:05 -0700
commit9d9fff3c3dbc207a8a2ee2114eab19086afecb6e (patch)
tree0747eb69f2a874e6ef271b007f847c1678578fbc /src
parentcfbd08a59cd70b3328b149499a91ff4fb8487d9a (diff)
parentdc33b3d7b21b2003d6835a06fecf9ed4f4535f7e (diff)
downloadlibgit2-9d9fff3c3dbc207a8a2ee2114eab19086afecb6e.tar.gz
Merge pull request #1631 from scottjg/fix-timezone-parsing
Don't bail on parsing commits with an invalid timezone
Diffstat (limited to 'src')
-rw-r--r--src/signature.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/signature.c b/src/signature.c
index 1131fb789..cd6167fb4 100644
--- a/src/signature.c
+++ b/src/signature.c
@@ -174,8 +174,10 @@ int git_signature__parse(git_signature *sig, const char **buffer_out,
tz_start = time_end + 1;
if ((tz_start[0] != '-' && tz_start[0] != '+') ||
- git__strtol32(&offset, tz_start + 1, &tz_end, 10) < 0)
- return signature_error("malformed timezone");
+ git__strtol32(&offset, tz_start + 1, &tz_end, 10) < 0) {
+ //malformed timezone, just assume it's zero
+ offset = 0;
+ }
hours = offset / 100;
mins = offset % 100;