[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[dak/master] debianqueued: do not try to use data outside of signed region



Reported-by: John Lightsey <lightsey@debian.org>
---
 tools/debianqueued-0.9/debianqueued | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tools/debianqueued-0.9/debianqueued b/tools/debianqueued-0.9/debianqueued
index 7d80a425..8b4d9a26 100755
--- a/tools/debianqueued-0.9/debianqueued
+++ b/tools/debianqueued-0.9/debianqueued
@@ -675,6 +675,9 @@ outer_loop: while (<CHANGES>) {
       $extralines++ if length $_ > 1;
       next;
     }
+    if ($pgplines != 1) {
+      next;
+    }
     if (/^Maintainer:\s*/i) {
       chomp( $main::mail_addr = $' );
       $main::mail_addr = $1 if $main::mail_addr =~ /<([^>]*)>/;
@@ -1110,7 +1113,12 @@ sub process_commands($) {
 outer_loop: while (<COMMANDS>) {
     if (/^---+(BEGIN|END) PGP .*---+$/) {
       ++$pgplines;
-    } elsif (/^Uploader:\s*/i) {
+      next;
+    }
+    if ($pgplines != 1) {
+      next;
+    }
+    if (/^Uploader:\s*/i) {
       chomp( $main::mail_addr = $' );
       $main::mail_addr = $1 if $main::mail_addr =~ /<([^>]*)>/;
     } elsif (/^Commands:/i) {
-- 
2.11.0


Reply to: