Changeset 34 for trunk/src/sh_error.c

Timestamp:

May 19, 2006, 8:09:51 PM (18 years ago)

Author:

rainer

Message:

Code cleanup and minor fixes

File:

• trunk/src/sh_error.c (modified) (2 diffs)

trunk/src/sh_error.c

@@ -1144 +1144 @@
                */
               export_block = 1;
-              ex_len = 64 + sl_strlen(lmsg->msg) + 1;
+              /* ex_len = 64 + sl_strlen(lmsg->msg) + 1; */
+              ex_len = sl_strlen(lmsg->msg);
+              if (sl_ok_adds(ex_len, 65))
+                ex_len = 64 + ex_len + 1;
               ex_msg = SH_ALLOC (ex_len);
 
@@ -1497 +1500 @@
       /*@i@*/required = sl_vsnprintf(&(lmsg->msg[len]), 
                                      (lmsg->msg_len - len), lmsg->format, vl);
-      if ( (required + len) > (lmsg->msg_len - 4) )
+      if ((required >= 0) && 
+          sl_ok_adds(required, len) &&
+          sl_ok_adds((required+len), 4) &&
+          ((required + len) > (lmsg->msg_len - 4)) )
         {
           /*@i@*/p = SH_ALLOC(required + len + 4);