crypt32: Merge two traces.

Francois Gouget fgouget at free.fr
Tue Feb 17 11:49:07 CST 2009


---

I don't see a point in keeping them separate, especially if the first 
one does not have a trailing '\n' since, iiuc, that will cause them to 
be concatenated in memory anyway before being sent out (so it won't 
avoid a buffer overflow).

The buffer overflow aspect is why I kept the third trace separate, 
though I have not idea if these strings are really so long that this is 
useful.

 dlls/crypt32/chain.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c
index dce06b7..5943117 100644
--- a/dlls/crypt32/chain.c
+++ b/dlls/crypt32/chain.c
@@ -800,9 +800,8 @@ static void dump_element(PCCERT_CONTEXT cert)
         TRACE_(chain)("issued to %s\n", debugstr_w(name));
         CryptMemFree(name);
     }
-    TRACE_(chain)("valid from %s",
-     debugstr_w(filetime_to_str(&cert->pCertInfo->NotBefore)));
-    TRACE_(chain)("to %s\n",
+    TRACE_(chain)("valid from %s to %s\n",
+     debugstr_w(filetime_to_str(&cert->pCertInfo->NotBefore)),
      debugstr_w(filetime_to_str(&cert->pCertInfo->NotAfter)));
     TRACE_(chain)("%d extensions\n", cert->pCertInfo->cExtension);
     for (i = 0; i < cert->pCertInfo->cExtension; i++)
-- 
1.5.6.5



More information about the wine-patches mailing list