diff options
| author | James Almer <jamrial@gmail.com> | 2013-06-15 14:03:37 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2013-06-15 18:50:11 -0300 |
| commit | 1bb005ce54d113e266f3c78354eb2bca65d5fa35 (patch) | |
| tree | f0c669ace5b319e70bbea36f2d9b3b7ad3c9d6a1 | |
| parent | b6249acae6963691211af21dc262be7ac0d9b090 (diff) | |
lavf/md5enc: Use AV_HASH_MAX_SIZE
Also increase the buffer size in write_trailer(), since 128
is not enough anymore
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/md5enc.c | 8 | ||||
| -rw-r--r-- | libavformat/version.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/md5enc.c b/libavformat/md5enc.c index 06c9c41c12..270d9fb660 100644 --- a/libavformat/md5enc.c +++ b/libavformat/md5enc.c @@ -35,7 +35,7 @@ struct MD5Context { static void md5_finish(struct AVFormatContext *s, char *buf) { struct MD5Context *c = s->priv_data; - uint8_t md5[32]; + uint8_t md5[AV_HASH_MAX_SIZE]; int i, offset = strlen(buf); int len = av_hash_get_size(c->hash); av_assert0(len > 0 && len <= sizeof(md5)); @@ -86,9 +86,9 @@ static int write_packet(struct AVFormatContext *s, AVPacket *pkt) static int write_trailer(struct AVFormatContext *s) { struct MD5Context *c = s->priv_data; - char buf[128]; - av_strlcpy(buf, av_hash_get_name(c->hash), sizeof(buf) - 100); - av_strlcat(buf, "=", sizeof(buf) - 100); + char buf[256]; + av_strlcpy(buf, av_hash_get_name(c->hash), sizeof(buf) - 200); + av_strlcat(buf, "=", sizeof(buf) - 200); md5_finish(s, buf); diff --git a/libavformat/version.h b/libavformat/version.h index 8db210ee07..6815c0b9bc 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #define LIBAVFORMAT_VERSION_MAJOR 55 #define LIBAVFORMAT_VERSION_MINOR 8 -#define LIBAVFORMAT_VERSION_MICRO 102 +#define LIBAVFORMAT_VERSION_MICRO 103 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ |