slightly improved/cleaned up debugging system

1 files changed, 16 insertions, 3 deletions

diff --git a/runtime/debug.c b/runtime/debug.c
index c82a411d..da471609 100644
--- a/runtime/debug.c
+++ b/runtime/debug.c
@@ -154,7 +154,9 @@ static pthread_key_t keyCallStack;
  */
 static void dbgMutexCancelCleanupHdlr(void *pmut)
 {
-	pthread_mutex_unlock((pthread_mutex_t*) pmut);
+	int ret;
+	ret = pthread_mutex_unlock((pthread_mutex_t*) pmut);
+	assert(ret == 0);
 }
 
 
@@ -846,6 +848,7 @@ dbgprint(obj_t *pObj, char *pszMsg, size_t lenMsg)
 	size_t lenWriteBuf;
 	struct timespec t;
 	uchar *pszObjName = NULL;
+	int ret;
 
 	/* we must get the object name before we lock the mutex, because the object
 	 * potentially calls back into us. If we locked the mutex, we would deadlock
@@ -857,7 +860,8 @@ dbgprint(obj_t *pObj, char *pszMsg, size_t lenMsg)
 		pszObjName = obj.GetName(pObj);
 	}
 
-	pthread_mutex_lock(&mutdbgprint);
+	ret = pthread_mutex_lock(&mutdbgprint);
+	assert(ret == 0); /* make sure mutex operation does not fail */
 	pthread_cleanup_push(dbgMutexCancelCleanupHdlr, &mutdbgprint);
 
 	/* The bWasNL handler does not really work. It works if no thread
@@ -941,6 +945,15 @@ dbgoprint(obj_t *pObj, char *fmt, ...)
 	va_start(ap, fmt);
 	lenWriteBuf = vsnprintf(pszWriteBuf, sizeof(pszWriteBuf), fmt, ap);
 	va_end(ap);
+	if(lenWriteBuf >= sizeof(pszWriteBuf)) {
+		/* prevent buffer overrruns and garbagge display */
+		pszWriteBuf[sizeof(pszWriteBuf) - 5] = '.';
+		pszWriteBuf[sizeof(pszWriteBuf) - 4] = '.';
+		pszWriteBuf[sizeof(pszWriteBuf) - 3] = '.';
+		pszWriteBuf[sizeof(pszWriteBuf) - 2] = '\n';
+		pszWriteBuf[sizeof(pszWriteBuf) - 1] = '\0';
+		lenWriteBuf = sizeof(pszWriteBuf);
+	}
 	dbgprint(pObj, pszWriteBuf, lenWriteBuf);
 }
 
@@ -952,7 +965,7 @@ void
 dbgprintf(char *fmt, ...)
 {
 	va_list ap;
-	char pszWriteBuf[20480];
+	char pszWriteBuf[32*1024];
 	size_t lenWriteBuf;
 
 	if(!(Debug && debugging_on))