[Pkg-gnupg-commit] r176 - in /gnupg/trunk/debian: changelog patches/00list patches/fix_infinite_loop_r5264.dpatch

[dleidert-guest at users.alioth.debian.org]

Author: dleidert-guest
Date: Sun Mar 21 14:20:13 2010
New Revision: 176

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=176
Log:
* debian/patches/fix_infinite_loop_r5264.dpatch: Added.
  - Avoid infinite loop in case of invalid data.

Added:
    gnupg/trunk/debian/patches/fix_infinite_loop_r5264.dpatch   (with props)
Modified:
    gnupg/trunk/debian/changelog
    gnupg/trunk/debian/patches/00list

Modified: gnupg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/changelog?rev=176&op=diff
==============================================================================
--- gnupg/trunk/debian/changelog (original)
+++ gnupg/trunk/debian/changelog Sun Mar 21 14:20:13 2010
@@ -23,6 +23,8 @@
   * debian/patches/567593_improve_info_and_faq.dpatch: Added.
     - Improve the info/manual pages, fix grammar and add/fix the bug-reporting
       address (closes: #567593).
+  * debian/patches/fix_infinite_loop_r5264.dpatch: Added.
+    - Avoid infinite loop in case of invalid data.
   * debian/patches/00list: Adjusted.
 
   [ Thijs Kinkhorst ]

Modified: gnupg/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/00list?rev=176&op=diff
==============================================================================
--- gnupg/trunk/debian/patches/00list (original)
+++ gnupg/trunk/debian/patches/00list Sun Mar 21 14:20:13 2010
@@ -6,3 +6,4 @@
 560995_fix_ftbfs_on_sparc64
 567580_menu_prompt_reflects_program
 567593_improve_info_and_faq
+fix_infinite_loop_r5264

Added: gnupg/trunk/debian/patches/fix_infinite_loop_r5264.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/patches/fix_infinite_loop_r5264.dpatch?rev=176&op=file
==============================================================================
--- gnupg/trunk/debian/patches/fix_infinite_loop_r5264.dpatch (added)
+++ gnupg/trunk/debian/patches/fix_infinite_loop_r5264.dpatch Sun Mar 21 14:20:13 2010
@@ -1,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix_infinite_loop_r5264.dpatch by Daniel Leidert (dale) <daniel.leidert at wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: * keygen.c (ask_user_id): Avoid infinite loop in case of invalid
+## DP:   data.
+## DP:
+## DP: <URL:https://bugs.g10code.com/gnupg/issue1186>
+## DP: <URL:http://lists.gnupg.org/pipermail/gnupg-commits/2010-February/008776.html>
+
+ at DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' trunk~/g10/keygen.c trunk/g10/keygen.c
+--- trunk~/g10/keygen.c	2009-07-29 10:42:59.000000000 +0200
++++ trunk/g10/keygen.c	2010-03-21 15:14:33.547740573 +0100
+@@ -1927,7 +1927,7 @@
+ 	    if( strlen(ansstr) != 10 )
+ 		BUG();
+ 	    if( cpr_enabled() ) {
+-		answer = xstrdup(ansstr+6);
++                answer = xstrdup (ansstr + (fail?8:6));
+ 		answer[1] = 0;
+ 	    }
+ 	    else {

Propchange: gnupg/trunk/debian/patches/fix_infinite_loop_r5264.dpatch
------------------------------------------------------------------------------
    svn:executable = *