[rtems commit] Fix assertion "BUF != NULL" for i386

Sebastian Huber sebh at rtems.org
Thu Oct 2 05:23:36 UTC 2014


Module:    rtems
Branch:    master
Commit:    9a8b29848d82a16b1a4c979e1b72e6a986deecb6
Changeset: http://git.rtems.org/rtems/commit/?id=9a8b29848d82a16b1a4c979e1b72e6a986deecb6

Author:    Moroz.Oleg <oleg.moroz at mcc.vniiem.ru>
Date:      Wed Oct  1 17:16:23 2014 +0400

Fix assertion "BUF != NULL" for i386

 BSP_uart_termios_write_com1 and BSP_uart_termios_write_com2

---

 c/src/lib/libbsp/i386/shared/comm/uart.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/c/src/lib/libbsp/i386/shared/comm/uart.c b/c/src/lib/libbsp/i386/shared/comm/uart.c
index 3c4d42a..72c7f36 100644
--- a/c/src/lib/libbsp/i386/shared/comm/uart.c
+++ b/c/src/lib/libbsp/i386/shared/comm/uart.c
@@ -568,13 +568,13 @@ BSP_uart_termios_read_com2(int uart)
 ssize_t
 BSP_uart_termios_write_com1(int minor, const char *buf, size_t len)
 {
-  assert(buf != NULL);
-
   if(len <= 0)
     {
       return 0;
     }
 
+  assert(buf != NULL);
+
   /* If there TX buffer is busy - something is royally screwed up */
   assert((uread(BSP_UART_COM1, LSR) & THRE) != 0);
 
@@ -602,13 +602,13 @@ BSP_uart_termios_write_com1(int minor, const char *buf, size_t len)
 ssize_t
 BSP_uart_termios_write_com2(int minor, const char *buf, size_t len)
 {
-  assert(buf != NULL);
-
   if(len <= 0)
     {
       return 0;
     }
 
+  assert(buf != NULL);
+
   /* If there TX buffer is busy - something is royally screwed up */
   assert((uread(BSP_UART_COM2, LSR) & THRE) != 0);
 



More information about the vc mailing list