Merge branch 'master' into pu/mp

Origin commit data
------------------
Branch: ni/coolstream
Commit: 6be63f736c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-23 (Wed, 23 Aug 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-08-23 13:10:49 +02:00
15 changed files with 40 additions and 29 deletions

View File

@@ -132,7 +132,7 @@ md5_stream (stream, resblock)
/* Important: BLOCKSIZE must be a multiple of 64. */
#define BLOCKSIZE 4096
struct md5_ctx ctx;
char buffer[BLOCKSIZE + 72];
char buffer[BLOCKSIZE + 72] = {0};
size_t sum;
/* Initialize the computation context. */

View File

@@ -704,8 +704,9 @@ void *tuxtxt_CacheThread(void * /*arg*/)
tuxtxt_cache.current_subpage[magazine] = -1;
continue;
}
#if 0 /* ? */
b1 &= 3;
#endif
b3 &= 7;
if (tuxtxt_is_dec(tuxtxt_cache.page_receiving)) /* ignore other subpage bits for hex pages */