[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-50-g076bb89

Jelmer Vernooij jelmer at samba.org
Wed Jan 21 16:32:46 GMT 2009


The branch, master has been updated
       via  076bb89028ea4d27a96492b2030d873b0d78ca24 (commit)
      from  2c1d70ab79ef3ae9de8074cae7e11cfaa1a84810 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 076bb89028ea4d27a96492b2030d873b0d78ca24
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Jan 21 17:32:08 2009 +0100

    expand-includes: Add simple protection against infinite recursion.

-----------------------------------------------------------------------

Summary of changes:
 source3/script/expand-includes.pl |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/script/expand-includes.pl b/source3/script/expand-includes.pl
index da64363..33fc44b 100755
--- a/source3/script/expand-includes.pl
+++ b/source3/script/expand-includes.pl
@@ -3,9 +3,13 @@
 # Copyright (C) 2009 Jelmer Vernooij <jelmer at samba.org>
 # Published under the GNU GPLv3 or later
 
+my $depth = 0;
+
 sub process($)
 {
 	my ($f) = @_;
+	$depth++;
+	die("Recursion in $f?") if ($depth > 100);
 	open(IN, $f) or die("Unable to open $f: $!");
 	foreach (<IN>) {
 		my $l = $_;
@@ -15,6 +19,7 @@ sub process($)
 			print $l;
 		}
 	}
+	$depth--;
 }
 
 my $path = shift;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list