summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2018-09-12 10:33:04 +1000
committerOlivier Fourdan <ofourdan@redhat.com>2018-10-04 17:26:04 +0200
commit26a83f9833054f5cf7c7d73b0f5aa080d400c26b (patch)
tree50b272529c3b6e4c3f4ac4f024f0e99b66b9299a
parentbdeab7863eb7abe2d9d05eed259542695935559c (diff)
xi: free modifiers_failed on error path. (v2)
Pointed out by coverity. v2: set modifies_failed to NULL at start (whot) Signed-off-by: Dave Airlie <airlied@redhat.com> (cherry picked from commit 51ae6126dcf3e234d0f678f02934bc9515abb8ae)
-rw-r--r--Xi/xipassivegrab.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c
index aa965e46f..65d5870f6 100644
--- a/Xi/xipassivegrab.c
+++ b/Xi/xipassivegrab.c
@@ -88,7 +88,7 @@ ProcXIPassiveGrabDevice(ClientPtr client)
};
int i, ret = Success;
uint32_t *modifiers;
- xXIGrabModifierInfo *modifiers_failed;
+ xXIGrabModifierInfo *modifiers_failed = NULL;
GrabMask mask = { 0 };
GrabParameters param;
void *tmp;
@@ -232,8 +232,8 @@ ProcXIPassiveGrabDevice(ClientPtr client)
if (rep.num_modifiers)
WriteToClient(client, rep.length * 4, modifiers_failed);
- free(modifiers_failed);
out:
+ free(modifiers_failed);
xi2mask_free(&mask.xi2mask);
return ret;
}