github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix missing

Browse source
This commit is contained in:
iceman1001 2024-05-14 15:20:01 +02:00
commit cd1f935846
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
client/src/proxmark3.c
View file

@ -385,7 +385,7 @@ void
__attribute__((force_align_arg_pointer)) __attribute__((force_align_arg_pointer))
#endif #endif
#endif #endif
main_loop(char *script_cmds_file, char *script_cmd, bool stayInCommandLoop) { main_loop(const char *script_cmds_file, char *script_cmd, bool stayInCommandLoop) {
char *cmd = NULL; char *cmd = NULL;
bool execCommand = (script_cmd != NULL); bool execCommand = (script_cmd != NULL);
@ -777,31 +777,29 @@ static void show_help(bool showFullHelp, char *exec_name) {
} }
static int dumpmem_to_file(const char *filename, uint32_t addr, uint32_t len, bool raw, bool in_bootloader) { static int dumpmem_to_file(const char *filename, uint32_t addr, uint32_t len, bool raw, bool in_bootloader) {
int res = PM3_EUNDEF;
uint8_t *buffer = calloc(len, sizeof(uint8_t)); uint8_t *buffer = calloc(len, sizeof(uint8_t));
if (!buffer) { if (buffer == NULL) {
PrintAndLogEx(ERR, "error, cannot allocate memory "); PrintAndLogEx(ERR, "error, cannot allocate memory ");
res = PM3_EMALLOC; return PM3_EMALLOC;
goto fail;
} }
size_t read = 0; int res = PM3_EUNDEF;
size_t readlen = 0;
DeviceMemType_t type = raw ? MCU_MEM : MCU_FLASH; DeviceMemType_t type = raw ? MCU_MEM : MCU_FLASH;
if (GetFromDevice(type, buffer, len, addr, NULL, 0, NULL, 1000, true)) { if (GetFromDevice(type, buffer, len, addr, NULL, 0, NULL, 1000, true)) {
res = PM3_SUCCESS; res = PM3_SUCCESS;
read = len; // GetFromDevice does not report the actual number of bytes received. readlen = len; // GetFromDevice does not report the actual number of bytes received.
} }
if (res == PM3_SUCCESS) { if (res == PM3_SUCCESS) {
if (saveFile(filename, ".bin", buffer, read) != 0) { res = saveFile(filename, ".bin", buffer, readlen);
if (res != PM3_SUCCESS) {
PrintAndLogEx(ERR, "error writing to file "_YELLOW_("%s"), filename); PrintAndLogEx(ERR, "error writing to file "_YELLOW_("%s"), filename);
res = PM3_EFILE;
} }
} }
free(buffer); free(buffer);
fail:
return res; return res;
} }
@ -1441,7 +1439,7 @@ int main(int argc, char *argv[]) {
MainGraphics(); MainGraphics();
# else # else
// for *nix distro's, check environment variable to verify a display // for *nix distro's, check environment variable to verify a display
char *display = getenv("DISPLAY"); const char *display = getenv("DISPLAY");
if (display && strlen(display) > 1) { if (display && strlen(display) > 1) {
InitGraphics(argc, argv, script_cmds_file, script_cmd, stayInCommandLoop); InitGraphics(argc, argv, script_cmds_file, script_cmd, stayInCommandLoop);
MainGraphics(); MainGraphics();

2
client/src/proxmark3.h
View file

@ -64,7 +64,7 @@ const char *get_my_executable_path(void);
const char *get_my_executable_directory(void); const char *get_my_executable_directory(void);
const char *get_my_user_directory(void); const char *get_my_user_directory(void);
void pm3_init(void); void pm3_init(void);
void main_loop(char *script_cmds_file, char *script_cmd, bool stayInCommandLoop); void main_loop(const char *script_cmds_file, char *script_cmd, bool stayInCommandLoop);
#ifdef __cplusplus #ifdef __cplusplus
} }