From b9c2f44336a4693e7ebb9afe011e7ff4c291ba6e Mon Sep 17 00:00:00 2001
From: David Shaw <dshaw@jabberwocky.com>
Date: Sat, 27 May 2006 01:38:54 +0000
Subject: [PATCH] * exec.c (make_tempdir) [_WIN32]: Modified to properly handle
 arbitrarily long temporary directory paths.

---
 g10/ChangeLog |  5 +++++
 g10/exec.c    | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/g10/ChangeLog b/g10/ChangeLog
index 53fc4bcc4..73c99ac10 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-25  Israel G. Lugo  <ilugo@bridonsecurity.com> (dshaw)
+
+	* exec.c (make_tempdir) [_WIN32]: Modified to properly handle
+	arbitrarily long temporary directory paths.
+
 2006-05-25  David Shaw  <dshaw@jabberwocky.com>
 
 	* keygen.c (gen_dsa): Allow generating DSA2 keys
diff --git a/g10/exec.c b/g10/exec.c
index 924349d25..2ad0d327c 100644
--- a/g10/exec.c
+++ b/g10/exec.c
@@ -129,16 +129,21 @@ static int make_tempdir(struct exec_info *info)
   if(tmp==NULL)
     {
 #if defined (_WIN32)
-      int err;
+      int tmp_siz;
+      int len=0;
 
-      tmp=xmalloc(MAX_PATH+1);
-      err=GetTempPath(MAX_PATH+1,tmp);
-      if(err==0 || err>MAX_PATH+1)
-	strcpy(tmp,"c:\\windows\\temp");
+      /* Poll temp path length */
+      tmp_siz=GetTempPath(0,NULL);
+      if(tmp_siz)
+	{
+	  tmp=xmalloc(tmp_siz);
+	  len=GetTempPath(tmp_siz,tmp);
+	}
+
+      if(len==0)
+	tmp=xstrdup("c:\\windows\\temp");
       else
 	{
-	  int len=strlen(tmp);
-
 	  /* GetTempPath may return with \ on the end */
 	  while(len>0 && tmp[len-1]=='\\')
 	    {