Skip to content

Fix strncpy truncation warning and cppcheck index-before-check error #3893

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BsAtHome wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −23
Open

Fix strncpy truncation warning and cppcheck index-before-check error #3893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 15 additions & 22 deletions src/emc/usr_intf/emcsh.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,9 +994,8 @@ static int emc_tool_offset(ClientData /*clientdata*/,
Tcl_Interp * interp, int objc,
Tcl_Obj * CONST objv[])
{
char string[1];
Tcl_Obj *tlobj;
string[0] = 'Z'; //default if not specified
char ch = 'Z'; //default if not specified

CHECKEMC
if (objc > 2) {
Expand All @@ -1009,10 +1008,10 @@ static int emc_tool_offset(ClientData /*clientdata*/,
}

if (objc != 1) {
strncpy(string, Tcl_GetStringFromObj(objv[1], 0),1);
ch = Tcl_GetStringFromObj(objv[1], 0)[0];
}

switch (string[0]) {
switch (ch) {
case 'x': case 'X':
tlobj = Tcl_NewDoubleObj(convertLinearUnits(
emcStatus->task.toolOffset.tran.x));
Expand Down Expand Up @@ -1115,7 +1114,6 @@ static int emc_abs_cmd_pos(ClientData /*clientdata*/,
Tcl_Interp * interp, int objc,
Tcl_Obj * CONST objv[])
{
char string[1];
Tcl_Obj *posobj;

CHECKEMC
Expand All @@ -1128,9 +1126,9 @@ static int emc_abs_cmd_pos(ClientData /*clientdata*/,
updateStatus();
}

strncpy(string, Tcl_GetStringFromObj(objv[1], 0),1);
char ch = Tcl_GetStringFromObj(objv[1], 0)[0];

switch (string[0]) {
switch (ch) {
case 'x': case 'X':
posobj = Tcl_NewDoubleObj(convertLinearUnits(
emcStatus->motion.traj.position.tran.x));
Expand Down Expand Up @@ -1180,7 +1178,6 @@ static int emc_abs_act_pos(ClientData /*clientdata*/,
Tcl_Interp * interp, int objc,
Tcl_Obj * CONST objv[])
{
char string[1];
Tcl_Obj *posobj;

CHECKEMC
Expand All @@ -1193,9 +1190,9 @@ static int emc_abs_act_pos(ClientData /*clientdata*/,
updateStatus();
}

strncpy(string, Tcl_GetStringFromObj(objv[1], 0),1);
char ch = Tcl_GetStringFromObj(objv[1], 0)[0];

switch (string[0]) {
switch (ch) {
case 'x': case 'X':
posobj = Tcl_NewDoubleObj(convertLinearUnits(
emcStatus->motion.traj.actualPosition.tran.x));
Expand Down Expand Up @@ -1245,7 +1242,6 @@ static int emc_rel_cmd_pos(ClientData /*clientdata*/,
Tcl_Interp * interp, int objc,
Tcl_Obj * CONST objv[])
{
char string[1];
Tcl_Obj *posobj;

CHECKEMC
Expand All @@ -1258,10 +1254,10 @@ static int emc_rel_cmd_pos(ClientData /*clientdata*/,
updateStatus();
}

strncpy(string, Tcl_GetStringFromObj(objv[1], 0),1);
char ch = Tcl_GetStringFromObj(objv[1], 0)[0];

double d = 0.0;
switch (string[0]) {
switch (ch) {
case 'x': case 'X':
d = convertLinearUnits(emcStatus->motion.traj.position.tran.x -
emcStatus->task.g5x_offset.tran.x -
Expand Down Expand Up @@ -1329,7 +1325,6 @@ static int emc_rel_act_pos(ClientData /*clientdata*/,
Tcl_Interp * interp, int objc,
Tcl_Obj * CONST objv[])
{
char string[1];
Tcl_Obj *posobj;

CHECKEMC
Expand All @@ -1342,10 +1337,10 @@ static int emc_rel_act_pos(ClientData /*clientdata*/,
updateStatus();
}

strncpy(string, Tcl_GetStringFromObj(objv[1], 0),1);
char ch = Tcl_GetStringFromObj(objv[1], 0)[0];

double d = 0.0;
switch (string[0]) {
switch (ch) {
case 'x': case 'X':
d = convertLinearUnits(emcStatus->motion.traj.actualPosition.tran.x -
emcStatus->task.g5x_offset.tran.x -
Expand Down Expand Up @@ -1442,7 +1437,6 @@ static int emc_pos_offset(ClientData /*clientdata*/,
Tcl_Interp * interp, int objc,
Tcl_Obj * CONST objv[])
{
char string[1];
Tcl_Obj *posobj;

CHECKEMC
Expand All @@ -1455,9 +1449,9 @@ static int emc_pos_offset(ClientData /*clientdata*/,
updateStatus();
}

strncpy(string, Tcl_GetStringFromObj(objv[1], 0),1);
char ch = Tcl_GetStringFromObj(objv[1], 0)[0];

switch (string[0]) {
switch (ch) {
case 'x': case 'X':
posobj = Tcl_NewDoubleObj(convertLinearUnits(emcStatus->task.g5x_offset.tran.x
+emcStatus->task.g92_offset.tran.x));
Expand Down Expand Up @@ -3116,7 +3110,6 @@ static int emc_probed_pos(ClientData /*clientdata*/,
Tcl_Interp * interp, int objc,
Tcl_Obj * CONST objv[])
{
char string[1];
Tcl_Obj *posobj;

CHECKEMC
Expand All @@ -3129,9 +3122,9 @@ static int emc_probed_pos(ClientData /*clientdata*/,
updateStatus();
}

strncpy(string, Tcl_GetStringFromObj(objv[1], 0),1);
char ch = Tcl_GetStringFromObj(objv[1], 0)[0];

switch (string[0]) {
switch (ch) {
case 'x': case 'X':
posobj = Tcl_NewDoubleObj(convertLinearUnits(
emcStatus->motion.traj.probedPosition.tran.x));
Expand Down
2 changes: 1 addition & 1 deletion src/libnml/rcs/rcs_print.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ int separate_words(char **_dest, int _max, char *_src)
rtapi_strxcpy(word_buffer, _src);
char* saveptr;
_dest[0] = strtok_r(word_buffer, " \n\r\t", &saveptr);
for (i = 0; NULL != _dest[i] && i < _max - 1; i++) {
for (i = 0; i < _max - 1 && NULL != _dest[i]; i++) {
_dest[i + 1] = strtok_r(NULL, " \n\r\t", &saveptr);
}
if (_dest[_max - 1] == NULL && i == _max - 1) {
Expand Down
Loading