Parcourir la source

Dpkg::BuildOptions: deal properly with undefined values in merge()

Raphaël Hertzog il y a 16 ans
Parent
commit
4c933be6a5
1 fichiers modifiés avec 1 ajouts et 0 suppressions
  1. 1 0
      scripts/Dpkg/BuildOptions.pm

+ 1 - 0
scripts/Dpkg/BuildOptions.pm

@@ -82,6 +82,7 @@ values like "nocheck parallel=2".
 
 
 sub merge {
 sub merge {
     my ($self, $content, $source) = @_;
     my ($self, $content, $source) = @_;
+    return 0 unless defined $content;
     my $count = 0;
     my $count = 0;
     foreach (split(/\s+/, $content)) {
     foreach (split(/\s+/, $content)) {
 	unless (/^([a-z][a-z0-9_-]*)(?:=(\S*))?$/) {
 	unless (/^([a-z][a-z0-9_-]*)(?:=(\S*))?$/) {