- dtucker@cvs.openbsd.org 2004/08/11 11:09:54

     [servconf.c]
     Fix minor leak; "looks right" deraadt@

diff --git a/ChangeLog b/ChangeLog
index 528b8c83cda61a687c6ec6e8adf459062c7b3e2f..109c28409d8f922bfe90416fa5740dbf01943454 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,9 @@
      [dh.c]
      return group14 when no primes found - fixes hang on empty /etc/moduli;
      ok markus@
+   - dtucker@cvs.openbsd.org 2004/08/11 11:09:54
+     [servconf.c]
+     Fix minor leak; "looks right" deraadt@
 
 20040720
  - (djm) OpenBSD CVS Sync

diff --git a/servconf.c b/servconf.c
index 02fae0fbe39defdd04f16ccfb70539b9d4e6ddc1..36b97a550e9b9b9dfa8afbf2d397de117a7b2299 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: servconf.c,v 1.135 2004/07/11 17:48:47 deraadt Exp $");
+RCSID("$OpenBSD: servconf.c,v 1.136 2004/08/11 11:09:54 dtucker Exp $");
 
 #include "ssh.h"
 #include "log.h"
@@ -974,18 +974,18 @@ void
 parse_server_config(ServerOptions *options, const char *filename, Buffer *conf)
 {
        int linenum, bad_options = 0;
-       char *cp, *cbuf;
+       char *cp, *obuf, *cbuf;
 
        debug2("%s: config %s len %d", __func__, filename, buffer_len(conf));
 
-       cbuf = xstrdup(buffer_ptr(conf));
+       obuf = cbuf = xstrdup(buffer_ptr(conf));
        linenum = 0;
        while((cp = strsep(&cbuf, "\n")) != NULL) {
                if (process_server_config_line(options, cp, filename,
                    linenum++) != 0)
                        bad_options++;
        }
-       free(cbuf);
+       xfree(obuf);
        if (bad_options > 0)
                fatal("%s: terminating, %d bad configuration options",
                    filename, bad_options);