From 66c971de9efdde4026e3073df2da7291c8dd95a4 Mon Sep 17 00:00:00 2001 From: schlaepfer Date: Fri, 20 Jan 2006 14:59:46 +0000 Subject: [PATCH] - prevent buffer overflow when reading uart data - uart data length updated to 256 git-svn-id: https://svn.code.sf.net/p/libusbjava/code/trunk@98 94ad28fe-ef68-46b1-9651-e7ae4fcf1c4c --- blackbox/Usb/Mod/BDIDll.otd | 4 ++-- blackbox/Usb/Mod/TargLog.otd | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/blackbox/Usb/Mod/BDIDll.otd b/blackbox/Usb/Mod/BDIDll.otd index ec27734..c635298 100644 --- a/blackbox/Usb/Mod/BDIDll.otd +++ b/blackbox/Usb/Mod/BDIDll.otd @@ -3,7 +3,7 @@ MODULE UsbBDIDll ["BDI.dll"]; CONST MAX_NOF_LONGS_FILL* = 84; - MAX_UART_DATA_LENGTH* = 128; + MAX_UART_DATA_LENGTH* = 256; TYPE PtrSTR* = POINTER TO ARRAY [untagged] OF SHORTCHAR; @@ -172,4 +172,4 @@ MODULE UsbBDIDll ["BDI.dll"]; PROCEDURE UART0_write* (data: (* ARRAY OF SHORTCHAR *) INTEGER; length: INTEGER): BOOL; (*END UART0_write; *) -END UsbBDIDll. \ No newline at end of file +END UsbBDIDll. diff --git a/blackbox/Usb/Mod/TargLog.otd b/blackbox/Usb/Mod/TargLog.otd index 853ebda..00a1329 100644 --- a/blackbox/Usb/Mod/TargLog.otd +++ b/blackbox/Usb/Mod/TargLog.otd @@ -27,6 +27,7 @@ MODULE UsbTargLog; BEGIN done := USB.UART0_read(data, length); IF done THEN + length := MIN(length, USB.MAX_UART_DATA_LENGTH ); FOR i := 0 TO length - 1 DO logWriter.WriteChar(data[i]) END