geos_one/bongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Buffer overrun fix from Albert Lee; potentially this solves some bizarre store crashes \o/

Browse Source
This commit is contained in:
alexhudson
2007-07-02 19:32:12 +00:00
parent 5a6768f0a4
commit 003986cefc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libs/xpl/hash.c
+4 -4
View File
@@ -83,7 +83,7 @@ XplHashWrite(xpl_hash_context *context, const void *buffer, size_t length)
void
XplHashFinalBytes(xpl_hash_context *context, unsigned char *buffer, size_t length)
{
memcpy(buffer, gcry_md_read(context->gcrypt_context, 0), length);
memcpy(buffer, gcry_md_read(context->gcrypt_context, 0), min(context->buffer_size, length));
gcry_md_close(context->gcrypt_context);
}
@@ -101,17 +101,17 @@ XplHashFinal(xpl_hash_context *context, xpl_hash_stringcase strcase, unsigned ch
char format[5];
unsigned char *digest;
unsigned char *p;
int i;
unsigned int i;
memcpy(format, "%02X\0", 5);
if (strcase == XPLHASH_LOWERCASE)
format[3] = 'x';
digest = MemMalloc(context->buffer_size);
memcpy(digest, gcry_md_read(context->gcrypt_context, 0), length);
memcpy(digest, gcry_md_read(context->gcrypt_context, 0), context->buffer_size);
gcry_md_close(context->gcrypt_context);
for (i = 0, p = buffer; i < min(context->buffer_size, length); i++, p += 2) {
for (i = 0, p = buffer; i < context->buffer_size && p < buffer+length-1; i++, p += 2) {
sprintf(p, format, digest[i]);
}
buffer[length-1] = 0;