From c165266cb32e030a25ceea894b73e80211937997 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@fedoraproject.org>
Date: Dec 01 2008 14:14:31 +0000
Subject: - patchlevel 044


---

diff --git a/7.2.044 b/7.2.044
new file mode 100644
index 0000000..4cfe651
--- /dev/null
+++ b/7.2.044
@@ -0,0 +1,161 @@
+To: vim-dev@vim.org
+Subject: Patch 7.2.044
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.2.044
+Problem:    Crash because of STRCPY() being over protective of the destination
+	    size. (Dominique Pelle)
+Solution:   Add -D_FORTIFY_SOURCE=1 to CFLAGS.  Use an intermediate variable
+	    for the pointer to avoid a warning.
+Files:	    src/auto/configure, src/configure.in, src/eval.c
+
+
+*** ../vim-7.2.043/src/auto/configure	Thu Jul 24 17:20:50 2008
+--- src/auto/configure	Sun Nov 16 17:08:44 2008
+***************
+*** 16819,16839 ****
+    LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
+  fi
+  
+- { $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
+- $as_echo_n "checking for GCC 3 or later... " >&6; }
+  DEPEND_CFLAGS_FILTER=
+  if test "$GCC" = yes; then
+    gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'`
+    if test "$gccmajor" -gt "2"; then
+      DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
+!   fi
+! fi
+! if test "$DEPEND_CFLAGS_FILTER" = ""; then
+!   { $as_echo "$as_me:$LINENO: result: no" >&5
+  $as_echo "no" >&6; }
+! else
+!   { $as_echo "$as_me:$LINENO: result: yes" >&5
+  $as_echo "yes" >&6; }
+  fi
+  
+  
+--- 16819,16847 ----
+    LDFLAGS="$LDFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc"
+  fi
+  
+  DEPEND_CFLAGS_FILTER=
+  if test "$GCC" = yes; then
++   { $as_echo "$as_me:$LINENO: checking for GCC 3 or later" >&5
++ $as_echo_n "checking for GCC 3 or later... " >&6; }
+    gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9]\)\..*$/\1/g'`
+    if test "$gccmajor" -gt "2"; then
+      DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
+!     { $as_echo "$as_me:$LINENO: result: yes" >&5
+! $as_echo "yes" >&6; }
+!   else
+!     { $as_echo "$as_me:$LINENO: result: no" >&5
+  $as_echo "no" >&6; }
+!   fi
+!       { $as_echo "$as_me:$LINENO: checking whether we need -D_FORTIFY_SOURCE=1" >&5
+! $as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; }
+!   if test "$gccmajor" -gt "3"; then
+!     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
+!     { $as_echo "$as_me:$LINENO: result: yes" >&5
+  $as_echo "yes" >&6; }
++   else
++     { $as_echo "$as_me:$LINENO: result: no" >&5
++ $as_echo "no" >&6; }
++   fi
+  fi
+  
+  
+*** ../vim-7.2.043/src/configure.in	Thu Jul 24 17:20:31 2008
+--- src/configure.in	Sun Nov 16 17:08:40 2008
+***************
+*** 3152,3169 ****
+  dnl But only when making dependencies, cproto and lint don't take "-isystem".
+  dnl Mac gcc returns "powerpc-apple-darwin8-gcc-4.0.1 (GCC)...", need to allow
+  dnl the number before the version number.
+- AC_MSG_CHECKING(for GCC 3 or later)
+  DEPEND_CFLAGS_FILTER=
+  if test "$GCC" = yes; then
+    gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'`
+    if test "$gccmajor" -gt "2"; then
+      DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
+    fi
+- fi
+- if test "$DEPEND_CFLAGS_FILTER" = ""; then
+-   AC_MSG_RESULT(no)
+- else
+-   AC_MSG_RESULT(yes)
+  fi
+  AC_SUBST(DEPEND_CFLAGS_FILTER)
+  
+--- 3152,3176 ----
+  dnl But only when making dependencies, cproto and lint don't take "-isystem".
+  dnl Mac gcc returns "powerpc-apple-darwin8-gcc-4.0.1 (GCC)...", need to allow
+  dnl the number before the version number.
+  DEPEND_CFLAGS_FILTER=
+  if test "$GCC" = yes; then
++   AC_MSG_CHECKING(for GCC 3 or later)
+    gccmajor=`echo "$gccversion" | sed -e 's/^\([[1-9]]\)\..*$/\1/g'`
+    if test "$gccmajor" -gt "2"; then
+      DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'"
++     AC_MSG_RESULT(yes)
++   else
++     AC_MSG_RESULT(no)
++   fi
++   dnl -D_FORTIFY_SOURCE=2 crashes Vim on strcpy(buf, "000") when buf is
++   dnl declared as char x[1] but actually longer.  Introduced in gcc 4.0.
++   AC_MSG_CHECKING(whether we need -D_FORTIFY_SOURCE=1)
++   if test "$gccmajor" -gt "3"; then
++     CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=1"
++     AC_MSG_RESULT(yes)
++   else
++     AC_MSG_RESULT(no)
+    fi
+  fi
+  AC_SUBST(DEPEND_CFLAGS_FILTER)
+  
+*** ../vim-7.2.043/src/eval.c	Wed Nov 12 15:28:37 2008
+--- src/eval.c	Sun Nov 16 20:46:28 2008
+***************
+*** 21150,21157 ****
+      init_var_dict(&fc.l_avars, &fc.l_avars_var);
+      add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "0",
+  				(varnumber_T)(argcount - fp->uf_args.ga_len));
+      v = &fc.fixvar[fixvar_idx++].var;
+!     STRCPY(v->di_key, "000");
+      v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
+      hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
+      v->di_tv.v_type = VAR_LIST;
+--- 21150,21160 ----
+      init_var_dict(&fc.l_avars, &fc.l_avars_var);
+      add_nr_var(&fc.l_avars, &fc.fixvar[fixvar_idx++].var, "0",
+  				(varnumber_T)(argcount - fp->uf_args.ga_len));
++     /* Use "name" to avoid a warning from some compiler that checks the
++      * destination size. */
+      v = &fc.fixvar[fixvar_idx++].var;
+!     name = v->di_key;
+!     STRCPY(name, "000");
+      v->di_flags = DI_FLAGS_RO | DI_FLAGS_FIX;
+      hash_add(&fc.l_avars.dv_hashtab, DI2HIKEY(v));
+      v->di_tv.v_type = VAR_LIST;
+*** ../vim-7.2.043/src/version.c	Thu Nov 20 10:26:19 2008
+--- src/version.c	Thu Nov 20 10:34:31 2008
+***************
+*** 678,679 ****
+--- 678,681 ----
+  {   /* Add new patch number below this line */
++ /**/
++     44,
+  /**/
+
+-- 
+Error:015 - Unable to exit Windows.  Try the door.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///