lantiq: fix segfault inside ltq-adsl-app

Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us>
This commit is contained in:
Daniel Gimpelevich 2016-05-27 15:27:41 -07:00 committed by John Crispin
parent 8333a6d0ba
commit 96ad827e17

View File

@ -0,0 +1,65 @@
--- a/src/dsl_cpe_cli_access.c 2016-05-27 12:34:43.612485449 -0700
+++ b/src/dsl_cpe_cli_access.c 2016-05-27 12:45:37.491727862 -0700
@@ -1142,7 +1142,7 @@
if ((ret < 0) && (autobootCtrl.accessCtl.nReturn < DSL_SUCCESS))
{
- DSL_CPE_FPrintf (out, sFailureReturn, autobootCtrl.accessCtl.nReturn);
+ DSL_CPE_FPrintf (out, sFailureReturn, autobootCtrl.accessCtl.nReturn, DSL_CPE_Fd2DevStr(fd));
}
else
{
@@ -1213,7 +1213,7 @@
if ((ret < 0) && (pData.accessCtl.nReturn < DSL_SUCCESS))
{
- DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn);
+ DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn, DSL_CPE_Fd2DevStr(fd));
}
else
{
@@ -1290,7 +1290,7 @@
if ((ret < 0) && (pData.accessCtl.nReturn < DSL_SUCCESS))
{
- DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn);
+ DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn, DSL_CPE_Fd2DevStr(fd));
}
else
{
@@ -1355,7 +1355,7 @@
pCtx, &resourceUsageStatisticsData);
if (ret < 0)
{
- DSL_CPE_FPrintf (out, sFailureReturn, ret);
+ DSL_CPE_FPrintf (out, sFailureReturn, ret, DSL_CPE_Fd2DevStr(fd));
}
else
{
@@ -3084,7 +3084,7 @@
if ((ret < 0) && (pData->accessCtl.nReturn < DSL_SUCCESS))
{
- DSL_CPE_FPrintf (out, sFailureReturn, pData->accessCtl.nReturn);
+ DSL_CPE_FPrintf (out, sFailureReturn, pData->accessCtl.nReturn, DSL_CPE_Fd2DevStr(fd));
}
else
{
@@ -4654,7 +4654,7 @@
if ((ret < 0) && (pData.accessCtl.nReturn < DSL_SUCCESS))
{
- DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn);
+ DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn, DSL_CPE_Fd2DevStr(fd));
}
else
{
@@ -5714,7 +5714,7 @@
if ((ret < 0) && (pData.accessCtl.nReturn < DSL_SUCCESS))
{
- DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn);
+ DSL_CPE_FPrintf (out, sFailureReturn, pData.accessCtl.nReturn, DSL_CPE_Fd2DevStr(fd));
}
else
{