|
 |
c9ace8 |
From fcd786753b2ba6b4fb82cc2affea8e0d61889c95 Mon Sep 17 00:00:00 2001
|
|
|
c9ace8 |
From: Timo Sirainen <timo.sirainen@open-xchange.com>
|
|
|
c9ace8 |
Date: Mon, 4 Feb 2019 19:23:02 -0800
|
|
|
c9ace8 |
Subject: [PATCH] lib-storage: Fix buffer overflow when reading oversized
|
|
|
c9ace8 |
hdr-pop3-uidl header
|
|
|
c9ace8 |
|
|
|
c9ace8 |
---
|
|
|
c9ace8 |
src/lib-storage/index/index-pop3-uidl.c | 4 ++--
|
|
|
c9ace8 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
c9ace8 |
|
|
|
c9ace8 |
diff --git a/src/lib-storage/index/index-pop3-uidl.c b/src/lib-storage/index/index-pop3-uidl.c
|
|
|
c9ace8 |
index 13b7363ef6..e537e9ff51 100644
|
|
|
c9ace8 |
--- a/src/lib-storage/index/index-pop3-uidl.c
|
|
|
c9ace8 |
+++ b/src/lib-storage/index/index-pop3-uidl.c
|
|
|
c9ace8 |
@@ -37,7 +37,7 @@ bool index_pop3_uidl_can_exist(struct mail *mail)
|
|
|
c9ace8 |
/* this header isn't set yet */
|
|
|
c9ace8 |
return TRUE;
|
|
|
c9ace8 |
}
|
|
|
c9ace8 |
- memcpy(&uidl, data, size);
|
|
|
c9ace8 |
+ memcpy(&uidl, data, sizeof(uidl));
|
|
|
c9ace8 |
return mail->uid <= uidl.max_uid_with_pop3_uidl;
|
|
|
c9ace8 |
}
|
|
|
c9ace8 |
|
|
|
c9ace8 |
@@ -95,7 +95,7 @@ void index_pop3_uidl_update_exists_finish(struct mailbox_transaction_context *tr
|
|
|
c9ace8 |
|
|
|
c9ace8 |
/* check if we have already the same header */
|
|
|
c9ace8 |
if (size >= sizeof(uidl)) {
|
|
|
c9ace8 |
- memcpy(&uidl, data, size);
|
|
|
c9ace8 |
+ memcpy(&uidl, data, sizeof(uidl));
|
|
|
c9ace8 |
if (trans->highest_pop3_uidl_uid == uidl.max_uid_with_pop3_uidl)
|
|
|
c9ace8 |
return;
|
|
|
c9ace8 |
}
|