Attachment 120975 Details for Bug 93675 – Check pointer before use

[patch] Check pointer before use

fix_segfault.diff (text/plain), 1.17 KB, created by Kyle Guinn on 2016-01-12 03:42:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle Guinn

Created: 2016-01-12 03:42:44 UTC

Size: 1.17 KB

patch

obsolete

>diff --git a/hw/xfree86/i2c/xf86i2c.c b/hw/xfree86/i2c/xf86i2c.c
>--- a/hw/xfree86/i2c/xf86i2c.c
>+++ b/hw/xfree86/i2c/xf86i2c.c
>@@ -615,19 +615,21 @@
> xf86DestroyI2CDevRec(I2CDevPtr d, Bool unalloc)
> {
>     if (d) {
>-        I2CDevPtr *p;
>+        if (d->pI2CBus) {
>+            I2CDevPtr *p;
> 
>-        /* Remove this from the list of active I2C devices. */
>+            /* Remove this from the list of active I2C devices. */
> 
>-        for (p = &d->pI2CBus->FirstDev; *p != NULL; p = &(*p)->NextDev)
>-            if (*p == d) {
>-                *p = (*p)->NextDev;
>-                break;
>-            }
>+            for (p = &d->pI2CBus->FirstDev; *p != NULL; p = &(*p)->NextDev)
>+                if (*p == d) {
>+                    *p = (*p)->NextDev;
>+                    break;
>+                }
> 
>-        xf86DrvMsg(d->pI2CBus->scrnIndex, X_INFO,
>-                   "I2C device \"%s:%s\" removed.\n",
>-                   d->pI2CBus->BusName, d->DevName);
>+            xf86DrvMsg(d->pI2CBus->scrnIndex, X_INFO,
>+                       "I2C device \"%s:%s\" removed.\n",
>+                       d->pI2CBus->BusName, d->DevName);
>+        }
> 
>         if (unalloc)
>             free(d);

Actions: View | Splinter Review

Attachments on bug 93675: 120975 | 121481 | 121584

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.