[or-cvs] r17117: {torvm} Fix merge error; writing to NULL is not very helpful. (torvm/trunk/build/win32/src/torvm-w32)

coderman at seul.org coderman at seul.org
Thu Oct 16 00:01:51 UTC 2008


Author: coderman
Date: 2008-10-15 20:01:51 -0400 (Wed, 15 Oct 2008)
New Revision: 17117

Modified:
   torvm/trunk/build/win32/src/torvm-w32/torvm.c
Log:
Fix merge error; writing to NULL is not very helpful.

Modified: torvm/trunk/build/win32/src/torvm-w32/torvm.c
===================================================================
--- torvm/trunk/build/win32/src/torvm-w32/torvm.c	2008-10-15 23:07:16 UTC (rev 17116)
+++ torvm/trunk/build/win32/src/torvm-w32/torvm.c	2008-10-16 00:01:51 UTC (rev 17117)
@@ -327,6 +327,7 @@
   ZeroMemory( &si, sizeof(si) );
   si.cb = sizeof(si);
   cmdlen = strlen(devcon) + 64;
+  cmd = (LPTSTR)malloc(cmdlen);
   snprintf (cmd, cmdlen, "\"%s\" install tortap91.inf TORTAP91", devcon);
   ldebug ("Tap install pwd: %s, cmd: %s", dir, cmd);
 



More information about the tor-commits mailing list