Messages in this thread Patch in this message | | | Date | Mon, 10 Jun 2002 17:53:42 -0700 | Subject | [PATCH] : ir250_checker.diff | From | Jean Tourrilhes <> |
| |
ir250_checker.diff : ------------------ o [CORRECT] Fix two bugs found by the Stanford checker in IrCOMM
diff -u -p linux/net/irda/ircomm/ircomm_core.d0.c linux/net/irda/ircomm/ircomm_core.c --- linux/net/irda/ircomm/ircomm_core.d0.c Mon Jun 10 11:28:44 2002 +++ linux/net/irda/ircomm/ircomm_core.c Mon Jun 10 11:30:01 2002 @@ -512,7 +512,7 @@ int ircomm_proc_read(char *buf, char **s self = (struct ircomm_cb *) hashbin_get_first(ircomm); while (self != NULL) { - ASSERT(self->magic == IRCOMM_MAGIC, return len;); + ASSERT(self->magic == IRCOMM_MAGIC, break;); if(self->line < 0x10) len += sprintf(buf+len, "ircomm%d", self->line); diff -u -p linux/net/irda/ircomm/ircomm_tty.d0.c linux/net/irda/ircomm/ircomm_tty.c --- linux/net/irda/ircomm/ircomm_tty.d0.c Mon Jun 10 11:28:57 2002 +++ linux/net/irda/ircomm/ircomm_tty.c Mon Jun 10 11:31:09 2002 @@ -523,6 +523,9 @@ static void ircomm_tty_close(struct tty_ if (!tty) return; + ASSERT(self != NULL, return;); + ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;); + save_flags(flags); cli(); @@ -533,9 +536,6 @@ static void ircomm_tty_close(struct tty_ IRDA_DEBUG(0, __FUNCTION__ "(), returning 1\n"); return; } - - ASSERT(self != NULL, return;); - ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;); if ((tty->count == 1) && (self->open_count != 1)) { /* - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |