diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2015-01-19 12:57:25 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2015-01-19 13:01:20 -0600 |
| commit | bcfcb485b98d42d8c67e8948c016f5e766a64b29 (patch) | |
| tree | ff4bdfe1e9f182089471c1901cd504b5e5a5aa9e /nuttx/drivers | |
| parent | 187cd324f6b573aa6619797784522455dd40129b (diff) | |
| download | px4-nuttx-bcfcb485b98d42d8c67e8948c016f5e766a64b29.tar.gz px4-nuttx-bcfcb485b98d42d8c67e8948c016f5e766a64b29.tar.bz2 px4-nuttx-bcfcb485b98d42d8c67e8948c016f5e766a64b29.zip | |
Fixes some issues found by the PX4 team using Coverity. From Pavel Krienko
Diffstat (limited to 'nuttx/drivers')
| -rw-r--r-- | nuttx/drivers/pipes/pipe.c | 5 | ||||
| -rw-r--r-- | nuttx/drivers/usbdev/cdcacm.c | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/nuttx/drivers/pipes/pipe.c b/nuttx/drivers/pipes/pipe.c index 264e5708e..60764c510 100644 --- a/nuttx/drivers/pipes/pipe.c +++ b/nuttx/drivers/pipes/pipe.c @@ -275,7 +275,10 @@ errout_with_wrfd: errout_with_driver: unregister_driver(devname); errout_with_dev: - pipecommon_freedev(dev); + if (dev) + { + pipecommon_freedev(dev); + } errout_with_pipe: pipe_free(pipeno); errout: diff --git a/nuttx/drivers/usbdev/cdcacm.c b/nuttx/drivers/usbdev/cdcacm.c index 797af20e4..445eba932 100644 --- a/nuttx/drivers/usbdev/cdcacm.c +++ b/nuttx/drivers/usbdev/cdcacm.c @@ -1205,14 +1205,15 @@ static void cdcacm_unbind(FAR struct usbdevclass_driver_s *driver, priv->nwrq--; /* Number of write requests queued */ } } + DEBUGASSERT(priv->nwrq == 0); irqrestore(flags); - } - /* Clear out all data in the circular buffer */ + /* Clear out all data in the circular buffer */ - priv->serdev.xmit.head = 0; - priv->serdev.xmit.tail = 0; + priv->serdev.xmit.head = 0; + priv->serdev.xmit.tail = 0; + } } /**************************************************************************** |