From: rousskov <>
Date: Sun, 22 Feb 1998 02:28:12 +0000 (+0000)
Subject: Added more overflow checking to ctx_print().
X-Git-Tag: SQUID_3_0_PRE1~4038
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b70d1c58a80dde02a165287ef81ba6e2dcc2088d;p=thirdparty%2Fsquid.git

Added more overflow checking to ctx_print().
---

diff --git a/src/debug.cc b/src/debug.cc
index 601e04c00f..a596bbc3e1 100644
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: debug.cc,v 1.60 1998/02/21 18:46:36 rousskov Exp $
+ * $Id: debug.cc,v 1.61 1998/02/21 19:28:12 rousskov Exp $
  *
  * DEBUG: section 0     Debug Routines
  * AUTHOR: Harvest Derived
@@ -390,6 +390,8 @@ static Ctx_Valid_Level = -1;
 static Ctx_Current_Level = -1;
 /* saved descriptions (stack) */
 static const char *Ctx_Descrs[CTX_MAX_LEVEL+1];
+/* "safe" get secription */
+static const char *ctx_get_descr(Ctx ctx);
 
 
 Ctx
@@ -438,8 +440,16 @@ ctx_print()
 	Ctx_Reported_Level++;
 	Ctx_Valid_Level++;
 	_db_print("ctx: enter: %2d '%s'\n", Ctx_Reported_Level, 
-	    Ctx_Descrs[Ctx_Reported_Level] ? Ctx_Descrs[Ctx_Reported_Level] : "<null>");
+	    ctx_get_descr(Ctx_Reported_Level));
     }
     /* unlock */
     Ctx_Lock--;
 }
+
+/* checks for nulls and overflows */
+static const char *
+ctx_get_descr(Ctx ctx)
+{
+    if (ctx < 0 || ctx > CTX_MAX_LEVEL) return "<lost>";
+    return Ctx_Descrs[ctx] ? Ctx_Descrs[ctx] : "<null>";
+}