jaiden
/
apk-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

don't use hardcoded checksum buffer sizes

cute-signatures
Reid Rankin 2020-01-24 15:13:43 +00:00 committed by Timo Teräs
parent aa882df511
commit c7c8ab7c57
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/apk_blob.h
View File

@ -36,12 +36,15 @@ extern apk_blob_t apk_null_blob;
#define APK_CHECKSUM_MD5 16 #define APK_CHECKSUM_MD5 16
#define APK_CHECKSUM_SHA1 20 #define APK_CHECKSUM_SHA1 20
#define APK_CHECKSUM_DEFAULT APK_CHECKSUM_SHA1 #define APK_CHECKSUM_DEFAULT APK_CHECKSUM_SHA1
#define APK_CHECKSUM_MAX APK_CHECKSUM_SHA1
#define APK_BLOB_CHECKSUM_BUF 34 /* Enough space for a hexdump of the longest checksum possible plus
* a two-character type prefix */
#define APK_BLOB_CHECKSUM_BUF (2 + (2 * APK_CHECKSUM_MAX))
/* Internal cointainer for MD5 or SHA1 */ /* Internal container for checksums */
struct apk_checksum { struct apk_checksum {
unsigned char data[20]; unsigned char data[APK_CHECKSUM_MAX];
unsigned char type; unsigned char type;
}; };

4
src/manifest.c
View File

@ -36,7 +36,7 @@ static void process_package(struct apk_database *db, struct apk_package *pkg)
struct apk_db_dir_instance *diri; struct apk_db_dir_instance *diri;
struct apk_db_file *file; struct apk_db_file *file;
struct hlist_node *dc, *dn, *fc, *fn; struct hlist_node *dc, *dn, *fc, *fn;
char csum_buf[(APK_CHECKSUM_SHA1 * 2) + 1]; char csum_buf[APK_BLOB_CHECKSUM_BUF];
if (ipkg == NULL) if (ipkg == NULL)
return; return;
@ -62,7 +62,7 @@ static int read_file_entry(void *ctx, const struct apk_file_info *ae,
struct apk_istream *is) struct apk_istream *is)
{ {
struct manifest_file_ctx *mctx = ctx; struct manifest_file_ctx *mctx = ctx;
char csum_buf[(APK_CHECKSUM_SHA1 * 2) + 1]; char csum_buf[APK_BLOB_CHECKSUM_BUF];
apk_blob_t csum_blob = APK_BLOB_BUF(csum_buf); apk_blob_t csum_blob = APK_BLOB_BUF(csum_buf);
int r; int r;