From 82801d14117250dda05a0ab00b0ea2323cab7b20 Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Tue, 27 Mar 2012 02:14:03 +0200 Subject: [PATCH] Fix some typos in documentation and comments. --- BUGS | 2 +- doc/selinux.txt | 2 +- src/p_armpe.cpp | 2 +- src/p_lx_exc.cpp | 2 +- src/p_w32pe.cpp | 6 +++--- src/p_wcle.cpp | 2 +- src/packer.cpp | 2 +- src/stub/src/i386-win32.pe.S | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/BUGS b/BUGS index ebd5cbd3..db46cbbd 100644 --- a/BUGS +++ b/BUGS @@ -44,7 +44,7 @@ test file. win32/pe -------- - * writeable shared sections (`--force' *may* work) + * writable shared sections (`--force' *may* work) * certificates in the image * compressing files which contain a big BSS requires lots of memory during compression diff --git a/doc/selinux.txt b/doc/selinux.txt index fd887e0c..925e9b84 100644 --- a/doc/selinux.txt +++ b/doc/selinux.txt @@ -20,7 +20,7 @@ code 127, and a record will be added to the history file In "targeted enforcing" mode, SELinux pays close attention mostly to designated processes that run with elevated privileges: web server, -print server, login server, etc. Ordinary user excutables receive +print server, login server, etc. Ordinary user executables receive much less scrutiny. However, one of the eventual goals of SELinux is to eradicate runtime generation of instructions because of the possibility for exploitation by malware (virus, trojan, key logger, privilege diff --git a/src/p_armpe.cpp b/src/p_armpe.cpp index 32d9fbca..eebf9958 100644 --- a/src/p_armpe.cpp +++ b/src/p_armpe.cpp @@ -599,7 +599,7 @@ void PackArmPe::pack(OutputFile *fo) if (((isection[ic].flags & (PEFL_WRITE|PEFL_SHARED)) == (PEFL_WRITE|PEFL_SHARED))) if (!opt->force) - throwCantPack("writeable shared sections not supported (try --force)"); + throwCantPack("writable shared sections not supported (try --force)"); if (jc && isection[ic].rawdataptr - jc > ih.filealign) throwCantPack("superfluous data between sections"); fi->seek(isection[ic].rawdataptr,SEEK_SET); diff --git a/src/p_lx_exc.cpp b/src/p_lx_exc.cpp index 5547f99a..01840901 100644 --- a/src/p_lx_exc.cpp +++ b/src/p_lx_exc.cpp @@ -449,7 +449,7 @@ int PackLinuxI386::getLoaderPrefixSize() const // some ELF utitlity functions **************************************************************************/ -// basic check of an Linux ELF Ehdr +// basic check of a Linux ELF Ehdr int PackLinuxI386::checkEhdr(const Elf_LE32_Ehdr *ehdr) const { const unsigned char * const buf = ehdr->e_ident; diff --git a/src/p_w32pe.cpp b/src/p_w32pe.cpp index b062d6fa..5f981287 100644 --- a/src/p_w32pe.cpp +++ b/src/p_w32pe.cpp @@ -834,7 +834,7 @@ void PackW32Pe::pack(OutputFile *fo) throwCantPack("PE32/EFIROM files are not yet supported"); break; } - case 14: //XBOX - will we ever see an XBOX file? + case 14: //XBOX - will we ever see a XBOX file? { throwCantPack("PE32/xbox files are not yet supported"); break; @@ -917,7 +917,7 @@ void PackW32Pe::pack(OutputFile *fo) if (!isrtm && ((isection[ic].flags & (PEFL_WRITE|PEFL_SHARED)) == (PEFL_WRITE|PEFL_SHARED))) if (!opt->force) - throwCantPack("writeable shared sections not supported (try --force)"); + throwCantPack("writable shared sections not supported (try --force)"); if (jc && isection[ic].rawdataptr - jc > ih.filealign) throwCantPack("superfluous data between sections"); fi->seek(isection[ic].rawdataptr,SEEK_SET); @@ -1092,7 +1092,7 @@ void PackW32Pe::pack(OutputFile *fo) // still in a read only section by looking at the pe header of the // file. If this check fails the runtime does "interesting" things // like not running the floating point initialization code - the result - // is an R6002 runtime error. + // is a R6002 runtime error. // These supposed to be read only addresses are covered by the sections // UPX0 & UPX1 in the compressed files, so we have to patch the PE header // in the memory. And the page on which the PE header is stored is read diff --git a/src/p_wcle.cpp b/src/p_wcle.cpp index 7c03bdf5..4107361d 100644 --- a/src/p_wcle.cpp +++ b/src/p_wcle.cpp @@ -360,7 +360,7 @@ void PackWcle::preprocessFixups() //if (memcmp(iimage+jc+fixp2,fix+5,(fix[1] & 0x10) ? 4 : 2)) // throwCantPack("illegal fixup offset"); - // work around an pmwunlite bug: remove duplicated fixups + // work around a pmwunlite bug: remove duplicated fixups // FIXME: fix the other cases too if (rc == 0 || get_le32(rl+4*rc-4) != jc+fixp2) { diff --git a/src/packer.cpp b/src/packer.cpp index 26924b50..4dff9b7b 100644 --- a/src/packer.cpp +++ b/src/packer.cpp @@ -475,7 +475,7 @@ void Packer::verifyOverlappingDecompression(upx_bytep o_ptr, unsigned o_size, Fi /************************************************************************* -// Find overhead for in-place decompression in an heuristic way +// Find overhead for in-place decompression in a heuristic way // (using a binary search). Return 0 on error. // // To speed up things: diff --git a/src/stub/src/i386-win32.pe.S b/src/stub/src/i386-win32.pe.S index 7387333d..e7a42b78 100644 --- a/src/stub/src/i386-win32.pe.S +++ b/src/stub/src/i386-win32.pe.S @@ -203,8 +203,8 @@ section PEDEPHAK #endif lea eax, [edi + swri] - andb [eax], 0x7f // marks UPX0 non writeable - andb [eax + 0x28], 0x7f // marks UPX1 non writeable + andb [eax], 0x7f // marks UPX0 non writable + andb [eax + 0x28], 0x7f // marks UPX1 non writable #if 0 push esp