From 9699a03e744a3cb097402c9a28307c118e4afadc Mon Sep 17 00:00:00 2001 From: Kalle Olavi Niemitalo Date: Sat, 26 Jan 2008 15:55:46 +0200 Subject: [PATCH] Don't assume sizeof(int)==4 in bittorrent (cherry picked from commit f3bad399e2e836bcb5fc96da5ed0501d4937980c) --- NEWS | 1 + src/protocol/bittorrent/piececache.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 107be73e..7eb53569 100644 --- a/NEWS +++ b/NEWS @@ -309,6 +309,7 @@ To be released as 0.11.4. * minor bug 461: ensure contrast in blank areas, to keep the cursor visible * minor bug 928: properly display no-break spaces in a UTF-8 document if the terminal uses some other charset +* minor: don't assume sizeof(int)==4 in bittorrent * trivial bug 947: document.html.wrap_nbsp also affects text in tables * trivial bug 997: fix unlikely stack corruption in active FTP * build bug 950: fix ``config/install-sh: No such file or directory'' diff --git a/src/protocol/bittorrent/piececache.c b/src/protocol/bittorrent/piececache.c index c7f4eac7..60431464 100644 --- a/src/protocol/bittorrent/piececache.c +++ b/src/protocol/bittorrent/piececache.c @@ -1079,7 +1079,7 @@ bittorrent_resume_writer(void *data, int fd) uint32_t piece; memcpy(&metafile.length, data, sizeof(metafile.length)); - metafile.source = (unsigned char *) data + 4; + metafile.source = (unsigned char *) data + sizeof(metafile.length); if (parse_bittorrent_metafile(&meta, &metafile) != BITTORRENT_STATE_OK) { done_bittorrent_meta(&meta);