From: Nickolai Zeldovich <nickolai@csail.mit.edu>
Date: Sun, 6 Jan 2013 04:45:33 +0000 (-0500)
Subject: butm/file_tm.c: check for null pointer before dereferencing
X-Git-Tag: upstream/1.8.0_pre1^2~1674
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4d6967e0b0a0628deb1dd9d210de84779d41f856;p=packages%2Fo%2Fopenafs.git

butm/file_tm.c: check for null pointer before dereferencing

Move the null pointer check to before the pointer is dereferenced.

Change-Id: I9983dae8802706c1efeff8a507a001b649572686
Reviewed-on: http://gerrit.openafs.org/8882
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
---

diff --git a/src/butm/file_tm.c b/src/butm/file_tm.c
index 73f7adc44..d53dd4c4f 100644
--- a/src/butm/file_tm.c
+++ b/src/butm/file_tm.c
@@ -991,14 +991,15 @@ file_Mount(struct butm_tapeInfo *info, char *tape)
     int xflags;
     afs_int32 code = 0, error = 0, rc = 0;
 
+    if (!info || !tape)
+	ERROR_EXIT(BUTM_BADARGUMENT);
+
     if (info->debug)
 	printf("butm: Mount tape drive\n");
 
     POLL();
     info->error = 0;
 
-    if (!info || !tape)
-	ERROR_EXIT(BUTM_BADARGUMENT);
     if (info->structVersion != BUTM_MAJORVERSION)
 	ERROR_EXIT(BUTM_OLDINTERFACE);
     if (info->tmRock)