From e39a49833fce8642f8b8f97e122deef6d8d75722 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@ncsa.illinois.edu>
Date: Thu, 14 Jul 2011 18:17:30 -0500
Subject: [PATCH] Fix accidental overwrite of BROPATH copy.

---
 src/util.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/util.cc b/src/util.cc
index 824010a28f..e3b9b632fd 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -893,13 +893,14 @@ FILE* search_for_file(const char* filename, const char* ext,
 		}
 
 	char path[1024], full_filename_buf[1024];
-	safe_strncpy(path, bro_path(), sizeof(path));
 
 	// append the currently loading script's path to BROPATH so that
 	// @loads can be referenced relatively
 	if ( current_scanned_file_path != "" )
-		safe_snprintf(path, sizeof(path), "%s:%s", path,
+		safe_snprintf(path, sizeof(path), "%s:%s", bro_path(),
 		              current_scanned_file_path.c_str());
+	else
+		safe_strncpy(path, bro_path(), sizeof(path));
 
 	char* dir_beginning = path;
 	char* dir_ending = path;