libftdi-git Archives

Subject: A library to talk to FTDI chips branch, master, updated. v1.4-1-g3b3a961

From: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
To: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
Date: Fri, 25 Aug 2017 11:34:50 +0200 (CEST)
The branch, master has been updated
       via  3b3a9614147038b37b69f5c2878841bad1db8af1 (commit)
      from  d5c1622a2ff0c722c0dc59533748489b45774e55 (commit)


- Log -----------------------------------------------------------------
commit 3b3a9614147038b37b69f5c2878841bad1db8af1
Author: Rolf Fiedler <derRolf@xxxxxxxxxxxxxx>
Date:   Fri Aug 25 11:33:35 2017 +0200

    Fix small memleak when ftdi_init() fails
    
    If libusb open fails (e.g. permission problem),
    then ftdi_init() leaks the memory for the eeprom data.

-----------------------------------------------------------------------

Summary of changes:
 src/ftdi.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/ftdi.c b/src/ftdi.c
index 175befc..b336c80 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -87,7 +87,7 @@ static void ftdi_usb_close_internal (struct ftdi_context 
*ftdi)
 */
 int ftdi_init(struct ftdi_context *ftdi)
 {
-    struct ftdi_eeprom* eeprom = (struct ftdi_eeprom *)malloc(sizeof(struct 
ftdi_eeprom));
+    struct ftdi_eeprom* eeprom;
     ftdi->usb_ctx = NULL;
     ftdi->usb_dev = NULL;
     ftdi->usb_read_timeout = 5000;
@@ -111,6 +111,7 @@ int ftdi_init(struct ftdi_context *ftdi)
     ftdi_set_interface(ftdi, INTERFACE_ANY);
     ftdi->bitbang_mode = 1; /* when bitbang is enabled this holds the number 
of the mode  */
 
+    eeprom = (struct ftdi_eeprom *)malloc(sizeof(struct ftdi_eeprom));
     if (eeprom == 0)
         ftdi_error_return(-2, "Can't malloc struct ftdi_eeprom");
     memset(eeprom, 0, sizeof(struct ftdi_eeprom));


hooks/post-receive
-- 
A library to talk to FTDI chips

--
libftdi-git - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx   

Current Thread
  • A library to talk to FTDI chips branch, master, updated. v1.4-1-g3b3a961, libftdi-git <=