d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct a logic error.

Browse Source
This commit is contained in:
Joseph Koshy 2006-12-24 09:45:10 +00:00
parent 9983b3c02d
commit 5eaae8bafd
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=165523
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/libelf/libelf_xlate.c
View File

@ -92,8 +92,18 @@ _libelf_xlate(Elf_Data *dst, const Elf_Data *src, unsigned int encoding,
return (NULL);
}
cnt = src->d_size / msz;
dsz = cnt * fsz;
/*
* Determine the number of objects that need to be converted, and
* the space required for the converted objects in the destination
* buffer.
*/
if (direction == ELF_TOMEMORY) {
cnt = src->d_size / fsz;
dsz = cnt * msz;
} else {
cnt = src->d_size / msz;
dsz = cnt * fsz;
}
if (dst->d_size < dsz) {
LIBELF_SET_ERROR(DATA, 0);
@ -107,12 +117,9 @@ _libelf_xlate(Elf_Data *dst, const Elf_Data *src, unsigned int encoding,
/*
* Check for overlapping buffers. Note that db == sb is
* allowed, in which case the source buffer must also be large
* enough for `n' target objects. For file to native
* conversions, an in-place conversion is not always possible.
* allowed.
*/
if ((db == sb && dsz < src->d_size) ||
(db != sb && de > sb && se > db)) {
if (db != sb && de > sb && se > db) {
LIBELF_SET_ERROR(DATA, 0);
return (NULL);
}
@ -124,7 +131,7 @@ _libelf_xlate(Elf_Data *dst, const Elf_Data *src, unsigned int encoding,
}
dst->d_type = src->d_type;
dst->d_size = cnt * fsz;
dst->d_size = dsz;
if (db == sb && encoding == LIBELF_PRIVATE(byteorder) &&
fsz == msz)