fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 15:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

util/xmlconfig: fix sha1 comparison code

Browse source 
Fixes: 8f48e7b1e9 ("util/xmlconfig: add new sha1 application attribute")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2730
Reviewed-by: Dave Airlie <airlied@redhat.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4426>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4426>
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2020-04-03 09:25:05 +02:00
parent 655e8449d0
commit 43f785419c
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/util/xmlconfig.c
View file

@ -791,7 +791,8 @@ parseAppAttr(struct OptConfData *data, const XML_Char **attr)
if (exec && strcmp (exec, data->execName)) {
data->ignoringApp = data->inApp;
} else if (sha1) {
if (strlen(sha1) != 40) {
/* SHA1_DIGEST_STRING_LENGTH includes terminating null byte */
if (strlen(sha1) != (SHA1_DIGEST_STRING_LENGTH - 1)) {
XML_WARNING("Incorrect sha1 application attribute");
data->ignoringApp = data->inApp;
} else {
@ -800,13 +801,13 @@ parseAppAttr(struct OptConfData *data, const XML_Char **attr)
char path[PATH_MAX];
if (util_get_process_exec_path(path, ARRAY_SIZE(path)) > 0 &&
(content = os_read_file(path, &len))) {
uint8_t sha1x[20];
char sha1s[40];
uint8_t sha1x[SHA1_DIGEST_LENGTH];
char sha1s[SHA1_DIGEST_STRING_LENGTH];
_mesa_sha1_compute(content, len, sha1x);
_mesa_sha1_format((char*) sha1s, sha1x);
free(content);
if (memcmp(sha1, sha1s, SHA1_DIGEST_LENGTH)) {
if (strcmp(sha1, sha1s)) {
data->ignoringApp = data->inApp;
}
} else {