From: Michael Vogt Date: Tue, 26 Jul 2011 09:57:16 +0000 (+0200) Subject: merged from lp:~donkult/apt/sid X-Git-Tag: 0.8.15.4~3 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/38c19831778f9bedb8538a65ac5bafed29e1941c?hp=cd84a799ecbb958af42e554629250a404889c651 merged from lp:~donkult/apt/sid --- diff --git a/apt-pkg/contrib/sha1.cc b/apt-pkg/contrib/sha1.cc index eae52d52f..abc2aaf9f 100644 --- a/apt-pkg/contrib/sha1.cc +++ b/apt-pkg/contrib/sha1.cc @@ -74,10 +74,9 @@ static void SHA1Transform(uint32_t state[5],uint8_t const buffer[64]) uint32_t l[16]; } CHAR64LONG16; - CHAR64LONG16 *block; + CHAR64LONG16 workspace, *block; - uint8_t workspace[64]; - block = (CHAR64LONG16 *)workspace; + block = &workspace; memcpy(block,buffer,sizeof(workspace)); /* Copy context->state[] to working vars */ diff --git a/debian/changelog b/debian/changelog index 18b59ec4e..1eeb57ae7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.8.15.4) unstable; urgency=low + + [ David Miller ] + * apt-pkg/contrib/sha1.cc: + - fix illegally casts of on-stack buffer to a type requiring more + alignment than it has resulting in segfaults on sparc (Closes: #634696) + + -- David Kalnischkies Tue, 26 Jul 2011 08:26:53 +0200 + apt (0.8.15.3) unstable; urgency=low [ Michael Vogt ]