Macintosh-Tools
/
hfsutils
mirror of https://github.com/JotaRandom/hfsutils.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2 from dcoshea/tcl-alloc-free 

xhfs: Use Tcl_Alloc()/Tcl_Free() as required when interacting with Tcl.

Signed-of-by: Pablo Lezaeta
Signed-of-by: dcochea
This commit is contained in:
Pablo Lezaeta Reyes [pˈaβ̞lo lˌe̞θaˈeta rˈejɛ] 2018-01-18 01:36:18 -03:00 committed by GitHub
parent b6df6a4599 e62ea3c5ac
commit 263327c7cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tclhfs.c
View File

@ -227,7 +227,7 @@ int getdir(Tcl_Interp *interp, volref *vref, const char *path)
Tcl_AppendElement(interp, str); Tcl_AppendElement(interp, str);
free(str); Tcl_Free(str);
} }
if (hfs_closedir(dir) == -1) if (hfs_closedir(dir) == -1)
@ -244,7 +244,7 @@ int getdir(Tcl_Interp *interp, volref *vref, const char *path)
Tcl_AppendElement(interp, str); Tcl_AppendElement(interp, str);
free(str); Tcl_Free(str);
} }
return TCL_OK; return TCL_OK;
@ -378,17 +378,12 @@ int file_cmd(ClientData clientData, Tcl_Interp *interp,
return TCL_ERROR; return TCL_ERROR;
} }
mem = ALLOC(char, bytes + 1); mem = Tcl_Alloc(bytes + 1);
if (mem == 0)
{
interp->result = "out of memory";
return TCL_ERROR;
}
bytes = hfs_read(file, mem, bytes); bytes = hfs_read(file, mem, bytes);
if (bytes == -1) if (bytes == -1)
{ {
free(mem); Tcl_Free(mem);
return error(interp, 0); return error(interp, 0);
} }
@ -902,7 +897,7 @@ int vol_cmd(ClientData clientData, Tcl_Interp *interp,
} }
result = Tcl_Merge(listc, listv); result = Tcl_Merge(listc, listv);
free(listv); Tcl_Free(listv);
Tcl_SetResult(interp, result, TCL_DYNAMIC); Tcl_SetResult(interp, result, TCL_DYNAMIC);
} }
@ -1047,7 +1042,7 @@ int vol_cmd(ClientData clientData, Tcl_Interp *interp,
} }
result = Tcl_Merge(fargc, fargv); result = Tcl_Merge(fargc, fargv);
free(fargv); Tcl_Free(fargv);
Tcl_SetResult(interp, result, TCL_DYNAMIC); Tcl_SetResult(interp, result, TCL_DYNAMIC);
} }
@ -1313,7 +1308,7 @@ int cmd_hfs(ClientData clientData, Tcl_Interp *interp,
badblocks = ALLOCX(unsigned long, listc); badblocks = ALLOCX(unsigned long, listc);
if (listc && badblocks == 0) if (listc && badblocks == 0)
{ {
free(listv); Tcl_Free(listv);
interp->result = "out of memory"; interp->result = "out of memory";
return TCL_ERROR; return TCL_ERROR;
@ -1324,13 +1319,13 @@ int cmd_hfs(ClientData clientData, Tcl_Interp *interp,
if (Tcl_ExprLong(interp, listv[i], if (Tcl_ExprLong(interp, listv[i],
(long *) &badblocks[i]) != TCL_OK) (long *) &badblocks[i]) != TCL_OK)
{ {
free(listv); Tcl_Free(listv);
FREE(badblocks); FREE(badblocks);
return TCL_ERROR; return TCL_ERROR;
} }
} }
free(listv); Tcl_Free(listv);
if (do_format(argv[2], partno, 0, argv[4], listc, badblocks) == -1) if (do_format(argv[2], partno, 0, argv[4], listc, badblocks) == -1)
{ {
@ -1352,6 +1347,7 @@ int cmd_hfs(ClientData clientData, Tcl_Interp *interp,
else if (strcmp(argv[1], "chartrans") == 0) else if (strcmp(argv[1], "chartrans") == 0)
{ {
char *result; char *result;
char *tclresult;
if (argc != 5) if (argc != 5)
{ {
@ -1387,7 +1383,11 @@ int cmd_hfs(ClientData clientData, Tcl_Interp *interp,
return TCL_ERROR; return TCL_ERROR;
} }
Tcl_SetResult(interp, result, TCL_DYNAMIC); tclresult = Tcl_Alloc(strlen(result) + 1);
memcpy(tclresult, result, strlen(result) + 1);
free(result);
Tcl_SetResult(interp, tclresult, TCL_DYNAMIC);
} }
else if (strcmp(argv[1], "version") == 0) else if (strcmp(argv[1], "version") == 0)
{ {