freezeLoader() sooner in PackLinuxElf32x86::buildLinuxLoader()

This commit is contained in:
John Reiser 2006-06-21 17:08:58 -07:00
parent 9181bcd9a7
commit b13f7366cf
2 changed files with 3 additions and 3 deletions

View File

@ -21,8 +21,8 @@ ifeq ($(firstword $(CXX)),g++)
USE_GNUC ?= 1 USE_GNUC ?= 1
endif endif
ifeq ($(USE_GNUC),1) ifeq ($(USE_GNUC),1)
CXXFLAGS += -O2 -MMD ##CXXFLAGS += -O2 -MMD
##CXXFLAGS += -O0 -g -MMD CXXFLAGS += -O0 -g -MMD
CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wpointer-arith -Wwrite-strings -Werror CXXFLAGS += -Wall -W -Wcast-align -Wcast-qual -Wpointer-arith -Wwrite-strings -Werror
##CXXFLAGS += -Wshadow ##CXXFLAGS += -Wshadow
endif endif

View File

@ -405,6 +405,7 @@ PackLinuxElf32x86::buildLinuxLoader(
addLoader("LEXEC020", NULL); addLoader("LEXEC020", NULL);
addLoader("FOLDEXEC", NULL); addLoader("FOLDEXEC", NULL);
freezeLoader();
upx_byte *ptr_cto = getLoader(); upx_byte *ptr_cto = getLoader();
int sz_cto = getLoaderSize(); int sz_cto = getLoaderSize();
if (0x20==(ft->id & 0xF0) || 0x30==(ft->id & 0xF0)) { // push byte '?' ; cto8 if (0x20==(ft->id & 0xF0) || 0x30==(ft->id & 0xF0)) { // push byte '?' ; cto8
@ -414,7 +415,6 @@ PackLinuxElf32x86::buildLinuxLoader(
// PackHeader and overlay_offset at the end of the output file, // PackHeader and overlay_offset at the end of the output file,
// after the compressed data. // after the compressed data.
freezeLoader();
return getLoaderSize(); return getLoaderSize();
} }