Merge "[Bugfix][T106BUG-149][T106BUG-151]Fix apn_name, username, password, apn_type length error when using demo to add or set apn"
diff --git a/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/data.cpp b/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/data.cpp
index 126624c..a4be3e7 100755
--- a/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/data.cpp
+++ b/cap/zx297520v3/src/lynq/packages/apps/Mobiletek_Tester_RDIT/data.cpp
@@ -157,8 +157,8 @@
return ret;
}
- memcpy(datacall.cdma_username, argv[4], QSER_APN_USERNAME_SIZE+1);
- memcpy(datacall.cdma_password, argv[5], QSER_APN_PASSWORD_SIZE+1);
+ memcpy(datacall.cdma_username, argv[4], QSER_APN_USERNAME_SIZE);
+ memcpy(datacall.cdma_password, argv[5], QSER_APN_PASSWORD_SIZE);
ret = qser_data_call_start(&datacall, &err);
printf("%s%d\n",TEST_RESULT,ret);
@@ -297,10 +297,10 @@
printf("LYNQ_QSER_APN_SET: auth_proto input error\n");
return ret;
}
- memcpy(apn.apn_name,argv[4],sizeof(argv[4]));
- memcpy(apn.username,argv[5],sizeof(argv[5]));
- memcpy(apn.password,argv[6],sizeof(argv[6]));
- memcpy(apn.apn_type,argv[7],sizeof(argv[7]));
+ memcpy(apn.apn_name,argv[4],QSER_APN_NAME_SIZE);
+ memcpy(apn.username,argv[5],QSER_APN_USERNAME_SIZE);
+ memcpy(apn.password,argv[6],QSER_APN_PASSWORD_SIZE);
+ memcpy(apn.apn_type,argv[7],QSER_APN_NAME_SIZE);
ret = qser_apn_set(&apn);
printf("%s%d\n",TEST_RESULT,ret);
return ret;
@@ -371,10 +371,12 @@
printf("LYNQ_QSER_APN_ADD: auth_proto input error\n");
return ret;
}
- memcpy(apn.apn_name,argv[3],sizeof(argv[3]));
- memcpy(apn.username,argv[4],sizeof(argv[4]));
- memcpy(apn.password,argv[5],sizeof(argv[5]));
- memcpy(apn.apn_type,argv[6],sizeof(argv[6]));
+
+ memcpy(apn.apn_name,argv[3],QSER_APN_NAME_SIZE);
+ memcpy(apn.username,argv[4],QSER_APN_USERNAME_SIZE);
+ memcpy(apn.password,argv[5],QSER_APN_PASSWORD_SIZE);
+ memcpy(apn.apn_type,argv[6],QSER_APN_NAME_SIZE);
+
printf("LYNQ_QSER_APN_ADD: ready to qser_apn_add\n");
ret = qser_apn_add(&apn, &profile_idx_char);
printf("%s%d,profile = %d\n",TEST_RESULT,ret,profile_idx_char);