asterisk-16.x-chan-lantiq: add compile fix 424/head
authorSebastian Kemper <sebastian_ml@gmx.net>
Sat, 4 May 2019 20:32:17 +0000 (22:32 +0200)
committerSebastian Kemper <sebastian_ml@gmx.net>
Sat, 4 May 2019 20:35:05 +0000 (22:35 +0200)
Patch from upstream pull request
(https://github.com/kochstefan/asterisk_channel_lantiq/pull/3).

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
net/asterisk-16.x-chan-lantiq/Makefile
net/asterisk-16.x-chan-lantiq/patches/01-Use-ast_malloc-and-ast_free-instead-of-malloc-and-free.patch [new file with mode: 0644]

index 2aa4fca2a8dafd68ee8d74d257d13a4f220400a4..5884673e9912e712ea2102b23715abcf30f08bc8 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=asterisk16-chan-lantiq
 PKG_VERSION:=20180215
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/kochstefan/asterisk_channel_lantiq.git
diff --git a/net/asterisk-16.x-chan-lantiq/patches/01-Use-ast_malloc-and-ast_free-instead-of-malloc-and-free.patch b/net/asterisk-16.x-chan-lantiq/patches/01-Use-ast_malloc-and-ast_free-instead-of-malloc-and-free.patch
new file mode 100644 (file)
index 0000000..f913b18
--- /dev/null
@@ -0,0 +1,43 @@
+commit 30f9a094c1c60e0d68e4ea189f48ecb47aebb485
+Author: arny <arnysch@gmx.net>
+Date:   Thu May 2 20:07:28 2019 +0200
+
+    Use ast_malloc and ast_free instead of malloc and free
+    in order to get rid of build errors with asterisk16 in OpenWrt
+    
+    Signed-off-by: arny <arnysch@gmx.net>
+
+diff --git a/src/channels/chan_lantiq.c b/src/channels/chan_lantiq.c
+index a8fc869..90002ab 100644
+--- a/src/channels/chan_lantiq.c
++++ b/src/channels/chan_lantiq.c
+@@ -563,9 +563,9 @@ lantiq_dev_binary_buffer_create(const char *path, uint8_t **ppBuf, uint32_t *pBu
+               goto on_exit;
+       }
+-      *ppBuf = malloc(file_stat.st_size);
++      *ppBuf = ast_malloc(file_stat.st_size);
+       if (*ppBuf == NULL) {
+-              ast_log(LOG_ERROR, "binary file %s memory allocation failed\n", path);
++              // Message already logged by ast_malloc
+               goto on_exit;
+       }
+@@ -583,7 +583,7 @@ on_exit:
+               fclose(fd);
+       if (*ppBuf != NULL && status)
+-              free(*ppBuf);
++              ast_free(*ppBuf);
+       return status;
+ }
+@@ -609,7 +609,7 @@ static int32_t lantiq_dev_firmware_download(int32_t fd, const char *path)
+       }
+       if (firmware != NULL)
+-              free(firmware);
++              ast_free(firmware);
+       return 0;
+ }