From c33882cc1c122aeca76c01e00c145bfb6045ff05 Mon Sep 17 00:00:00 2001 From: alexhudson Date: Mon, 2 Jul 2007 20:34:29 +0000 Subject: [PATCH] * Another buffer overflow in config.c found by Albert Lee * Python 2.5 warning fixed --- src/agents/store/config.c | 4 ++-- src/libs/python/bongo/external/simplejson/scanner.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/agents/store/config.c b/src/agents/store/config.c index 4cb3d36..fcbd2dc 100644 --- a/src/agents/store/config.c +++ b/src/agents/store/config.c @@ -66,7 +66,7 @@ StoreAgentReadConfiguration(BOOL *recover) // which hosts do we trust? StoreAgent.trustedHosts.count = 2; - StoreAgent.trustedHosts.hosts = MemRealloc(StoreAgent.trustedHosts.hosts, 2 + 2); + StoreAgent.trustedHosts.hosts = MemRealloc(StoreAgent.trustedHosts.hosts, sizeof(unsigned long) * 2); if (!StoreAgent.trustedHosts.hosts) { StoreAgent.trustedHosts.count = 0; } else { @@ -106,7 +106,7 @@ StoreAgentReadConfiguration(BOOL *recover) MDBRead(MSGSRV_AGENT_STORE, MSGSRV_A_STORE_TRUSTED_HOSTS, vs); StoreAgent.trustedHosts.hosts = MemRealloc(StoreAgent.trustedHosts.hosts, - StoreAgent.trustedHosts.count + 2); + StoreAgent.trustedHosts.count * sizeof(unsigned long)); if (!StoreAgent.trustedHosts.hosts) { StoreAgent.trustedHosts.count = 0; } diff --git a/src/libs/python/bongo/external/simplejson/scanner.py b/src/libs/python/bongo/external/simplejson/scanner.py index c2e9b6e..64f4999 100644 --- a/src/libs/python/bongo/external/simplejson/scanner.py +++ b/src/libs/python/bongo/external/simplejson/scanner.py @@ -3,7 +3,7 @@ Iterator based sre token scanner """ import sre_parse, sre_compile, sre_constants from sre_constants import BRANCH, SUBPATTERN -from sre import VERBOSE, MULTILINE, DOTALL +from re import VERBOSE, MULTILINE, DOTALL import re __all__ = ['Scanner', 'pattern']