* random/unix/sha2.c (apr__SHA256_Final): Avoid C pointer aliasing

  violation.

Submitted by: Jan Kaluza <jkaluza redhat.com>


git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1420109 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 1 deletions

diff --git a/random/unix/sha2.c b/random/unix/sha2.c
index 1f5c1b2e8..12c257d1f 100644
--- a/random/unix/sha2.c
+++ b/random/unix/sha2.c
@@ -465,7 +465,14 @@ void apr__SHA256_Final(sha2_byte digest[], SHA256_CTX* context) {
                         *context->buffer = 0x80;
                 }
                 /* Set the bit count: */
-                *(sha2_word64*)&context->buffer[SHA256_SHORT_BLOCK_LENGTH] = context->bitcount;
+                {
+                        union dummy {
+                                apr_uint64_t bitcount;
+                                apr_byte_t bytes[8];
+                        } bitcount;
+                        bitcount.bitcount = context->bitcount;
+                        MEMCPY_BCOPY(&context->buffer[SHA256_SHORT_BLOCK_LENGTH], bitcount.bytes, 8);
+                }
 
                 /* Final transform: */
                 apr__SHA256_Transform(context, (sha2_word32*)context->buffer);