make sure we never overflow errmsgbuf

diff --git a/ChangeLog b/ChangeLog
index 4b431b1e76d350017520a2b844263745e4a7e686..694e503c9cc91c72abb78941913e8e689046b23e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 20 22:59:39 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * lib/ehandle.c: make sure we never overflow errmsgbuf
+
 Fri Apr 20 14:59:14 CDT 2001 Adam Heath <doogie@debian.org>
 
   * main/main.c: Accidentally commited a debug fprintf stmt in the last ci.

diff --git a/lib/ehandle.c b/lib/ehandle.c
index 3f647d4437068ac44e0351d1b394e32cc8a2cf09..515e2b5216c0f05e280184dbbce1a2285e361eea 100644 (file)
--- a/lib/ehandle.c
+++ b/lib/ehandle.c
@@ -77,8 +77,9 @@ void push_error_handler(jmp_buf *jbufp,
   necp= malloc(sizeof(struct errorcontext));
   if (!necp) {
     int e= errno;
-    strcpy(errmsgbuf, (_("out of memory pushing error handler: ")));
-    strcat(errmsgbuf, strerror(e));  errmsg= errmsgbuf;
+    snprintf(errmsgbuf, sizeof(errmsgbuf), "%s%s", 
+           _("out of memory pushing error handler: "), strerror(e));
+    errmsg= errmsgbuf;
     if (econtext) longjmp(*econtext->jbufp,1);
     fprintf(stderr, "%s: %s\n", thisname, errmsgbuf); exit(2);
   }
@@ -215,7 +216,7 @@ void pop_cleanup(int flagset) {
 void ohshit(const char *fmt, ...) {
   va_list al;
   va_start(al,fmt);
-  vsprintf(errmsgbuf,fmt,al);
+  vsnprintf(errmsgbuf,sizeof(errmsgbuf),fmt,al);
   va_end(al);
   errmsg= errmsgbuf;
   longjmp(*econtext->jbufp,1);
@@ -235,7 +236,7 @@ void ohshitvb(struct varbuf *vb) {
 }
 
 void ohshitv(const char *fmt, va_list al) {
-  vsprintf(errmsgbuf,fmt,al);
+  vsnprintf(errmsgbuf,sizeof(errmsgbuf),fmt,al);
   errmsg= errmsgbuf;
   longjmp(*econtext->jbufp,1);
 }
@@ -243,31 +244,31 @@ void ohshitv(const char *fmt, va_list al) {
 void ohshite(const char *fmt, ...) {
   int e;
   va_list al;
+  char buf[1024];
 
   e=errno;
   va_start(al,fmt);
-  vsprintf(errmsgbuf,fmt,al);
+  vsnprintf(buf,sizeof(buf),fmt,al);
   va_end(al);
 
-  strcat(errmsgbuf,": ");
-  strcat(errmsgbuf,strerror(e));
+  snprintf(errmsgbuf,sizeof(errmsgbuf),"%s: %s",buf,strerror(e));
   errmsg= errmsgbuf; 
   longjmp(*econtext->jbufp,1);
 }
 
 void badusage(const char *fmt, ...) {
+  char buf[1024];
   va_list al;
   va_start(al,fmt);
-  vsprintf(errmsgbuf,fmt,al);
+  vsnprintf(buf,sizeof(buf), fmt,al);
   va_end(al);
-  strcat(errmsgbuf,"\n\n");
-  strcat(errmsgbuf,gettext(printforhelp));
+  snprintf(errmsgbuf,sizeof(errmsgbuf),"%s\n\n%s", buf, gettext(printforhelp));
   errmsg= errmsgbuf; 
   longjmp(*econtext->jbufp,1);
 }
 
 void werr(const char *fn) {
-  ohshite(_("error writing `%.250s'"),fn);
+  ohshite(_("error writing `%s'"),fn);
 }
 
 void do_internerr(const char *string, int line, const char *file) {