[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

[Török Edvin]

The following commit has been merged in the debian/unstable branch:
commit 1d1dd80f321ae0fe77f51e8481d6eea07a4d5717
Author: Török Edvin <edwin at clamav.net>
Date:   Fri Sep 11 15:17:48 2009 +0300

    Fix global variable names.

diff --git a/libclamav/c++/bytecode2llvm.cpp b/libclamav/c++/bytecode2llvm.cpp
index 0a81258..2394d69 100644
--- a/libclamav/c++/bytecode2llvm.cpp
+++ b/libclamav/c++/bytecode2llvm.cpp
@@ -356,11 +356,13 @@ public:
 	globals.reserve(bc->num_globals);
 	for (unsigned i=0;i<bc->num_globals;i++) {
 	    const Type *Ty = mapType(bc->globaltys[i]);
-	    GlobalVariable *GV = cast<GlobalVariable>(M->getOrInsertGlobal("glob"+i,
-									   Ty));
+
 	    // TODO: validate number of components against type_components
 	    unsigned c = 0;
-	    GV->setInitializer(buildConstant(Ty, bc->globals[i], c));
+	    Constant *C = buildConstant(Ty, bc->globals[i], c);
+	    GlobalVariable *GV = new GlobalVariable(*M, Ty, true,
+						    GlobalValue::InternalLinkage,
+						    C, "glob"+Twine(i));
 	    globals.push_back(GV);
 	}
 

-- 
Debian repository for ClamAV