From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 14 Mar 2016 14:36:40 +0000 (+0100)
Subject: memdebug: skip logging the limit countdown, fflush when reached
X-Git-Tag: curl-7_48_0~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a353b105a9476635acbf1d9188e6ef9a6596f79;p=thirdparty%2Fcurl.git

memdebug: skip logging the limit countdown, fflush when reached
---

diff --git a/lib/memdebug.c b/lib/memdebug.c
index 59a0fe982e..804b5fa347 100644
--- a/lib/memdebug.c
+++ b/lib/memdebug.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -146,6 +146,7 @@ static bool countcheck(const char *func, int line, const char *source)
         /* log to stderr also */
         fprintf(stderr, "LIMIT %s:%d %s reached memlimit\n",
                 source, line, func);
+        fflush(logfile); /* because it might crash now */
       }
       SET_ERRNO(ENOMEM);
       return TRUE; /* RETURN ERROR! */
@@ -153,10 +154,6 @@ static bool countcheck(const char *func, int line, const char *source)
     else
       memsize--; /* countdown */
 
-    /* log the countdown */
-    if(source)
-      curl_memlog("LIMIT %s:%d %ld ALLOCS left\n",
-                  source, line, memsize);
 
   }