remote-helpers: add extra safety checks

Suggested-by: Roman Ovchinnikov <coolthecold@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
index 7e345320ada69f1cbb909130d406cf08ce9ae130..332aba784b8810120df8e1ddfafeb034a55337a3 100755 (executable)
--- a/contrib/remote-helpers/git-remote-bzr
+++ b/contrib/remote-helpers/git-remote-bzr
@@ -883,6 +883,16 @@ def main(args):
     global branches, peers
     global transports
 
     global branches, peers
     global transports
 

+    marks = None
+    is_tmp = False
+    gitdir = os.environ.get('GIT_DIR', None)
+
+    if len(args) < 3:
+        die('Not enough arguments.')
+
+    if not gitdir:
+        die('GIT_DIR not set')
+

     alias = args[1]
     url = args[2]
 
     alias = args[1]
     url = args[2]
 


@@ -891,7 +901,6 @@ def main(args):
     blob_marks = {}
     parsed_refs = {}
     files_cache = {}
     blob_marks = {}
     parsed_refs = {}
     files_cache = {}

-    marks = None

     branches = {}
     peers = {}
     transports = []
     branches = {}
     peers = {}
     transports = []


@@ -899,11 +908,8 @@ def main(args):
     if alias[5:] == url:
         is_tmp = True
         alias = hashlib.sha1(alias).hexdigest()
     if alias[5:] == url:
         is_tmp = True
         alias = hashlib.sha1(alias).hexdigest()

-    else:
-        is_tmp = False

 
     prefix = 'refs/bzr/%s' % alias
 
     prefix = 'refs/bzr/%s' % alias

-    gitdir = os.environ['GIT_DIR']

     dirname = os.path.join(gitdir, 'bzr', alias)
 
     if not is_tmp:
     dirname = os.path.join(gitdir, 'bzr', alias)
 
     if not is_tmp:

diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 3cd964dd2d8200bbc1c1f4086bae9bf085d8e434..852fdcf517beff751378dcf158545428bb07b5e5 100755 (executable)
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -1164,6 +1164,16 @@ def main(args):
     global dry_run
     global notes, alias
 
     global dry_run
     global notes, alias
 

+    marks = None
+    is_tmp = False
+    gitdir = os.environ.get('GIT_DIR', None)
+
+    if len(args) < 3:
+        die('Not enough arguments.')
+
+    if not gitdir:
+        die('GIT_DIR not set')
+

     alias = args[1]
     url = args[2]
     peer = None
     alias = args[1]
     url = args[2]
     peer = None


@@ -1184,16 +1194,12 @@ def main(args):
     if alias[4:] == url:
         is_tmp = True
         alias = hashlib.sha1(alias).hexdigest()
     if alias[4:] == url:
         is_tmp = True
         alias = hashlib.sha1(alias).hexdigest()

-    else:
-        is_tmp = False

 
 

-    gitdir = os.environ['GIT_DIR']

     dirname = os.path.join(gitdir, 'hg', alias)
     branches = {}
     bmarks = {}
     blob_marks = {}
     parsed_refs = {}
     dirname = os.path.join(gitdir, 'hg', alias)
     branches = {}
     bmarks = {}
     blob_marks = {}
     parsed_refs = {}

-    marks = None

     parsed_tags = {}
     filenodes = {}
     fake_bmark = None
     parsed_tags = {}
     filenodes = {}
     fake_bmark = None