Skip to content

Commit 86ee47b

Browse files
cconloncconlon
authored
Merge pull request #246 from JacobBarthelmeh/memory
fix XFREE/MALLOC typo to be WFREE/MALLOC
2 parents 257e885 + 22cab29 commit 86ee47b

2 files changed

Lines changed: 41 additions & 41 deletions

File tree

‎examples/sftpclient/sftpclient.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ static int doCmds(func_args* args)
645645
}
646646
} while ((err == WS_WANT_READ || err == WS_WANT_WRITE)
647647
&& ret != WS_SUCCESS);
648-
XFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
648+
WFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
649649
continue;
650650
}
651651

@@ -737,7 +737,7 @@ static int doCmds(func_args* args)
737737
}
738738
}
739739
resume = 0;
740-
XFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
740+
WFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
741741
continue;
742742
}
743743

@@ -828,7 +828,7 @@ static int doCmds(func_args* args)
828828
}
829829
}
830830
resume = 0;
831-
XFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
831+
WFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
832832
continue;
833833
}
834834

@@ -874,7 +874,7 @@ static int doCmds(func_args* args)
874874

875875
if (ret == WS_SUCCESS) {
876876
sz = (int)WSTRLEN(pt);
877-
XFREE(workingDir, NULL, DYNAMIC_TYPE_TMP_BUFFER);
877+
WFREE(workingDir, NULL, DYNAMIC_TYPE_TMP_BUFFER);
878878
workingDir = (char*)WMALLOC(sz + 1, NULL, DYNAMIC_TYPE_TMP_BUFFER);
879879
if (workingDir == NULL) {
880880
err_msg("Error malloc'ing");
@@ -885,7 +885,7 @@ static int doCmds(func_args* args)
885885

886886
clean_path(workingDir);
887887
}
888-
XFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
888+
WFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
889889
continue;
890890
}
891891

@@ -961,7 +961,7 @@ static int doCmds(func_args* args)
961961
}
962962
}
963963

964-
XFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
964+
WFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
965965
continue;
966966
}
967967

@@ -1010,7 +1010,7 @@ static int doCmds(func_args* args)
10101010
}
10111011
}
10121012
}
1013-
XFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
1013+
WFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
10141014
continue;
10151015
}
10161016

@@ -1056,7 +1056,7 @@ static int doCmds(func_args* args)
10561056
}
10571057
}
10581058
}
1059-
XFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
1059+
WFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
10601060
continue;
10611061
}
10621062

@@ -1129,8 +1129,8 @@ static int doCmds(func_args* args)
11291129
return -1;
11301130
}
11311131
}
1132-
XFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
1133-
XFREE(fTo, NULL, DYNAMIC_TYPE_TMP_BUFFER);
1132+
WFREE(f, NULL, DYNAMIC_TYPE_TMP_BUFFER);
1133+
WFREE(fTo, NULL, DYNAMIC_TYPE_TMP_BUFFER);
11341134
continue;
11351135

11361136
}
@@ -1452,7 +1452,7 @@ THREAD_RETURN WOLFSSH_THREAD sftpclient_test(void* args)
14521452
ret = doAutopilot(autopilot, apLocal, apRemote);
14531453
}
14541454

1455-
XFREE(workingDir, NULL, DYNAMIC_TYPE_TMP_BUFFER);
1455+
WFREE(workingDir, NULL, DYNAMIC_TYPE_TMP_BUFFER);
14561456
if (ret == WS_SUCCESS) {
14571457
if (wolfSSH_shutdown(ssh) != WS_SUCCESS) {
14581458
printf("error with wolfSSH_shutdown(), already disconnected?\n");

‎src/wolfsftp.c‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -428,124 +428,124 @@ static void wolfSSH_SFTP_ClearState(WOLFSSH* ssh, enum WS_SFTP_STATE_ID state)
428428
state = ~state; /* set all bits hot */
429429

430430
if (state & STATE_ID_GET) {
431-
XFREE(ssh->getState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
431+
WFREE(ssh->getState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
432432
ssh->getState = NULL;
433433
}
434434

435435
if (state & STATE_ID_LSTAT) {
436436
if (ssh->lstatState) {
437-
XFREE(ssh->lstatState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
438-
XFREE(ssh->lstatState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
437+
WFREE(ssh->lstatState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
438+
WFREE(ssh->lstatState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
439439
ssh->lstatState = NULL;
440440
}
441441
}
442442

443443
if (state & STATE_ID_OPEN) {
444-
XFREE(ssh->openState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
444+
WFREE(ssh->openState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
445445
ssh->openState = NULL;
446446
}
447447

448448
if (state & STATE_ID_SEND_READ) {
449-
XFREE(ssh->sendReadState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
449+
WFREE(ssh->sendReadState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
450450
ssh->sendReadState = NULL;
451451
}
452452

453453
if (state & STATE_ID_CLOSE) {
454-
XFREE(ssh->closeState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
454+
WFREE(ssh->closeState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
455455
ssh->closeState = NULL;
456456
}
457457

458458
if (state & STATE_ID_GET_HANDLE) {
459-
XFREE(ssh->getHandleState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
459+
WFREE(ssh->getHandleState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
460460
ssh->getHandleState = NULL;
461461
}
462462

463463
if (state & STATE_ID_NAME) {
464464
if (ssh->nameState) {
465-
XFREE(ssh->nameState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
466-
XFREE(ssh->nameState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
465+
WFREE(ssh->nameState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
466+
WFREE(ssh->nameState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
467467
ssh->nameState = NULL;
468468
}
469469
}
470470

471471
if (state & STATE_ID_SEND) {
472472
if (ssh->sendState) {
473-
XFREE(ssh->sendState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
474-
XFREE(ssh->sendState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
473+
WFREE(ssh->sendState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
474+
WFREE(ssh->sendState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
475475
ssh->sendState = NULL;
476476
}
477477
}
478478

479479
if (state & STATE_ID_LS) {
480480
if (ssh->lsState) {
481-
XFREE(ssh->lsState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
481+
WFREE(ssh->lsState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
482482
ssh->lsState = NULL;
483483
}
484484
}
485485

486486
if (state & STATE_ID_READDIR) {
487487
if (ssh->readDirState) {
488-
XFREE(ssh->readDirState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
488+
WFREE(ssh->readDirState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
489489
ssh->readDirState = NULL;
490490
}
491491
}
492492

493493
if (state & STATE_ID_PUT) {
494-
XFREE(ssh->putState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
494+
WFREE(ssh->putState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
495495
ssh->putState = NULL;
496496
}
497497

498498
if (state & STATE_ID_SEND_WRITE) {
499-
XFREE(ssh->sendWriteState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
499+
WFREE(ssh->sendWriteState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
500500
ssh->sendWriteState = NULL;
501501
}
502502

503503
if (state & STATE_ID_RM) {
504504
if (ssh->rmState != NULL)
505-
XFREE(ssh->rmState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
506-
XFREE(ssh->rmState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
505+
WFREE(ssh->rmState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
506+
WFREE(ssh->rmState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
507507
ssh->rmState = NULL;
508508
}
509509

510510
if (state & STATE_ID_MKDIR) {
511511
if (ssh->mkdirState != NULL)
512-
XFREE(ssh->mkdirState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
513-
XFREE(ssh->mkdirState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
512+
WFREE(ssh->mkdirState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
513+
WFREE(ssh->mkdirState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
514514
ssh->mkdirState = NULL;
515515
}
516516

517517
if (state & STATE_ID_RMDIR) {
518518
if (ssh->rmdirState != NULL)
519-
XFREE(ssh->rmdirState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
520-
XFREE(ssh->rmdirState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
519+
WFREE(ssh->rmdirState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
520+
WFREE(ssh->rmdirState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
521521
ssh->rmdirState = NULL;
522522
}
523523

524524
if (state & STATE_ID_RENAME) {
525525
if (ssh->renameState != NULL)
526-
XFREE(ssh->renameState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
527-
XFREE(ssh->renameState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
526+
WFREE(ssh->renameState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
527+
WFREE(ssh->renameState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
528528
ssh->renameState = NULL;
529529
}
530530

531531
if (state & STATE_ID_RECV) {
532532
if (ssh->recvState != NULL)
533-
XFREE(ssh->recvState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
534-
XFREE(ssh->recvState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
533+
WFREE(ssh->recvState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
534+
WFREE(ssh->recvState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
535535
ssh->recvState = NULL;
536536
}
537537

538538
if (state & STATE_ID_CHMOD) {
539539
if (ssh->chmodState) {
540-
XFREE(ssh->chmodState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
540+
WFREE(ssh->chmodState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
541541
ssh->chmodState = NULL;
542542
}
543543
}
544544

545545
if (state & STATE_ID_SETATR) {
546546
if (ssh->setatrState) {
547-
XFREE(ssh->setatrState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
548-
XFREE(ssh->setatrState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
547+
WFREE(ssh->setatrState->data, ssh->ctx->heap, DYNTYPE_BUFFER);
548+
WFREE(ssh->setatrState, ssh->ctx->heap, DYNTYPE_SFTP_STATE);
549549
ssh->setatrState = NULL;
550550
}
551551
}
@@ -2522,7 +2522,7 @@ int wolfSSH_SFTP_SetDefaultPath(WOLFSSH* ssh, const char* path)
25222522
if (path != NULL) {
25232523
word32 sftpDefaultPathSz;
25242524
sftpDefaultPathSz = (word32)XSTRLEN(path) + 1;
2525-
ssh->sftpDefaultPath = (char*)XMALLOC(sftpDefaultPathSz,
2525+
ssh->sftpDefaultPath = (char*)WMALLOC(sftpDefaultPathSz,
25262526
ssh->ctx->heap, DYNTYPE_STRING);
25272527
if (ssh->sftpDefaultPath == NULL) {
25282528
ssh->error = WS_MEMORY_E;
@@ -5791,7 +5791,7 @@ int wolfSSH_SFTP_SetSTAT(WOLFSSH* ssh, char* dir, WS_SFTP_FILEATRB* atr)
57915791
ret = WS_FATAL_ERROR;
57925792
break;
57935793
}
5794-
XFREE(state->data, ssh->ctx->heap, DYNTYPE_BUFFER);
5794+
WFREE(state->data, ssh->ctx->heap, DYNTYPE_BUFFER);
57955795
state->data = (byte*)WMALLOC(maxSz, ssh->ctx->heap, DYNTYPE_BUFFER);
57965796
if (state->data == NULL) {
57975797
ret = WS_MEMORY_E;

0 commit comments

Comments
 (0)