From 116d158e85ec43577ff69aeb3271ab1f888500c9 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 15 Mar 2006 16:16:24 +0000 Subject: [PATCH] Coverity #269: Compare the requested ABI class against the ABI class of the module, not the module class. --- ChangeLog | 2 ++ hw/xfree86/loader/loadmod.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d1cb2589f..714598a78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * hw/xfree86/loader/loadmod.c: Coverity #1053: Nuke a dead variable. + Coverity #269: Compare the requested ABI class against the ABI class + of the module, not the module class. * miext/cw/cw.c: Coverity #337: Remove useless NULL check. diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index de357e2cc..a887e2597 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -716,7 +716,7 @@ CheckVersion(const char *module, XF86ModuleVersionInfo * data, return FALSE; } } else if (req->abiclass != ABI_CLASS_NONE) { - if (!data->abiclass || strcmp(req->abiclass, data->moduleclass)) { + if (!data->abiclass || strcmp(req->abiclass, data->abiclass)) { xf86MsgVerb(X_WARNING, 2, "ABI class (%s) doesn't match the " "required ABI class (%s)\n", data->abiclass ? data->abiclass : "",