From: Jan Andres <jandres@gmx.net>
Date: Tue, 29 Nov 2005 15:30:46 GMT
Subject: [PATCH] Fix typo in http-push.c, take two
Message-ID: <20051129153046.GA9091@pitr.home.jan>
In-Reply-To: <20051129133537.GA490@pitr.home.jan>

Ok, so this is my final(?) proposal for the fix.

---

Fix a bug in handle_new_lock_ctx()'s memory allocation which may cause
segfaults.

Signed-off-by: Jan Andres <jandres@gmx.net>

---

diff --git a/http-push.c b/http-push.c
index 76c7886..bbb5118 100644
--- a/http-push.c
+++ b/http-push.c
@@ -784,7 +784,8 @@ static void handle_new_lock_ctx(struct x
 					strtol(ctx->cdata + 7, NULL, 10);
 		} else if (!strcmp(ctx->name, DAV_ACTIVELOCK_TOKEN)) {
 			if (!strncmp(ctx->cdata, "opaquelocktoken:", 16)) {
-				lock->token = xmalloc(strlen(ctx->cdata - 15));
+				lock->token =
+					xmalloc(strlen(ctx->cdata + 16) + 1);
 				strcpy(lock->token, ctx->cdata + 16);
 			}
 		}
---
0.99.9.GIT

-- 
Jan Andres <jandres@gmx.net>