summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorKevin Tang <zhikait@codeaurora.org>2018-08-24 16:57:57 -0700
committerKevin Tang <zhikait@codeaurora.org>2018-08-24 16:57:57 -0700
commit0a196513162c60f595e1c5cea351900c1eb77019 (patch)
treefd0d37293908d8d3808dff0ba161eac1dc209d7e /core
parentd2980eb906a57d6d2179786d35f681178c76a4b9 (diff)
downloadgps-0a196513162c60f595e1c5cea351900c1eb77019.tar.gz
GPS: unify buffer size passed to retrieve string with loc cfg
Loc cfg parsing routines assuming that string buffer size is LOC_MAX_PARAM_STRING. Changes are to make sure that caller to loc cfg routine does use that buffer of size LOC_MAX_PARAM_STRING. Change-Id: Icecf6bf017e6dda1da0766adc746f60d471653d0 CRs-fixed: 2301437
Diffstat (limited to 'core')
-rw-r--r--core/ContextBase.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/core/ContextBase.h b/core/ContextBase.h
index d268f5a..bdabf7b 100644
--- a/core/ContextBase.h
+++ b/core/ContextBase.h
@@ -36,9 +36,6 @@
#include <LBSProxyBase.h>
#include <loc_cfg.h>
-#define MAX_XTRA_SERVER_URL_LENGTH (256)
-#define MAX_SUPL_SERVER_URL_LENGTH (256)
-
/* GPS.conf support */
/* NOTE: the implementaiton of the parser casts number
fields to 32 bit. To ensure all 'n' fields working,
@@ -53,9 +50,9 @@ typedef struct loc_gps_cfg_s
uint32_t CAPABILITIES;
uint32_t LPP_PROFILE;
uint32_t XTRA_VERSION_CHECK;
- char XTRA_SERVER_1[MAX_XTRA_SERVER_URL_LENGTH];
- char XTRA_SERVER_2[MAX_XTRA_SERVER_URL_LENGTH];
- char XTRA_SERVER_3[MAX_XTRA_SERVER_URL_LENGTH];
+ char XTRA_SERVER_1[LOC_MAX_PARAM_STRING];
+ char XTRA_SERVER_2[LOC_MAX_PARAM_STRING];
+ char XTRA_SERVER_3[LOC_MAX_PARAM_STRING];
uint32_t USE_EMERGENCY_PDN_FOR_EMERGENCY_SUPL;
uint32_t NMEA_PROVIDER;
uint32_t GPS_LOCK;
@@ -65,10 +62,10 @@ typedef struct loc_gps_cfg_s
uint32_t LPPE_CP_TECHNOLOGY;
uint32_t LPPE_UP_TECHNOLOGY;
uint32_t EXTERNAL_DR_ENABLED;
- char SUPL_HOST[MAX_SUPL_SERVER_URL_LENGTH];
+ char SUPL_HOST[LOC_MAX_PARAM_STRING];
uint32_t SUPL_PORT;
uint32_t MODEM_TYPE;
- char MO_SUPL_HOST[MAX_SUPL_SERVER_URL_LENGTH];
+ char MO_SUPL_HOST[LOC_MAX_PARAM_STRING];
uint32_t MO_SUPL_PORT;
} loc_gps_cfg_s_type;