Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 19:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move plugin verification pattern to qt_find_pattern()

Browse source 
making it and the its length static aswell as removing redundant check if
pattern is null while at it

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-02-23 22:59:46 +00:00
parent 353bed4682
commit 3e4d4bed67
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/plugin/qlibrary.cpp
View file

@ -247,8 +247,7 @@ static bool qt_parse_pattern(const char *s, uint *version)
return ret; return ret;
} }
static long qt_find_pattern(const char *s, ulong s_len, static long qt_find_pattern(const char *s, ulong s_len)
const char *pattern, ulong p_len)
{ {
/* /*
we search from the end of the file because on the supported we search from the end of the file because on the supported
@ -262,7 +261,11 @@ static long qt_find_pattern(const char *s, ulong s_len,
because we have to skip over all the debugging symbols first because we have to skip over all the debugging symbols first
*/ */
if (! s || ! pattern || p_len > s_len) return -1; static const char pattern[] = "pattern=KT_PLUGIN_VERIFICATION_DATA";
static const ulong p_len = qstrlen(pattern);
if (!s || p_len > s_len)
return -1;
ulong i, hs = 0, hp = 0, delta = s_len - p_len; ulong i, hs = 0, hp = 0, delta = s_len - p_len;
for (i = 0; i < p_len; ++i) { for (i = 0; i < p_len; ++i) {
@ -317,9 +320,7 @@ static bool qt_unix_query(const QString &library, uint *version, QLibraryPrivate
/* /*
ELF binaries build with GNU or Clang have .ktplugin sections. ELF binaries build with GNU or Clang have .ktplugin sections.
*/ */
const char pattern[] = "pattern=KT_PLUGIN_VERIFICATION_DATA"; const long pos = qt_find_pattern(filedata, fdlen);
const ulong plen = qstrlen(pattern);
const long pos = qt_find_pattern(filedata, fdlen, pattern, plen);
bool ret = false; bool ret = false;
if (pos >= 0) if (pos >= 0)
ret = qt_parse_pattern(filedata + pos, version); ret = qt_parse_pattern(filedata + pos, version);