github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-22 06:13:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Marker V2 fixes

Browse source
This commit is contained in:
Jacob Litewski 2024-04-19 07:53:20 -04:00
commit 560b6f9dc2
2 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
client/src/proxgui.cpp
View file

@ -139,7 +139,7 @@ extern "C" void InitGraphics(int argc, char **argv, char *script_cmds_file, char
void add_temporary_marker(uint32_t position, const char *label) { void add_temporary_marker(uint32_t position, const char *label) {
if(g_TempMarkerSize == 0) { //Initialize the marker array if(g_TempMarkerSize == 0) { //Initialize the marker array
g_TempMarkers = (marker_t*)malloc(sizeof(marker_t)); g_TempMarkers = (marker_t*)calloc(1, sizeof(marker_t));
} else { //add more space to the marker array using realloc() } else { //add more space to the marker array using realloc()
marker_t *temp = (marker_t*)realloc(g_TempMarkers, ((g_TempMarkerSize + 1) * sizeof(marker_t))); marker_t *temp = (marker_t*)realloc(g_TempMarkers, ((g_TempMarkerSize + 1) * sizeof(marker_t)));
@ -155,12 +155,12 @@ void add_temporary_marker(uint32_t position, const char *label) {
g_TempMarkers[g_TempMarkerSize].pos = position; g_TempMarkers[g_TempMarkerSize].pos = position;
char *markerLabel = (char*)malloc(strlen(label)); char *markerLabel = (char*)calloc(1, strlen(label) + 1);
strcpy(markerLabel, label); strcpy(markerLabel, label);
if(strlen(markerLabel) > 29) { if(strlen(markerLabel) > 30) {
PrintAndLogEx(WARNING, "Label for temporary marker too long! Trunicating..."); PrintAndLogEx(WARNING, "Label for temporary marker too long! Trunicating...");
markerLabel[29] = '\0'; markerLabel[30] = '\0';
} }
strncpy(g_TempMarkers[g_TempMarkerSize].label, markerLabel, 30); strncpy(g_TempMarkers[g_TempMarkerSize].label, markerLabel, 30);

22
client/src/proxguiqt.cpp
View file

@ -783,8 +783,7 @@ void Plot::drawAnnotations(QRect annotationRect, QPainter *painter) {
char graphText[] = "@%u..%u dt=%i %s zoom=%2.3f"; char graphText[] = "@%u..%u dt=%i %s zoom=%2.3f";
length = ((sizeof(graphText))+(sizeof(uint32_t)*3)+sizeof(scalestr)+sizeof(float_t)); length = ((sizeof(graphText))+(sizeof(uint32_t)*3)+sizeof(scalestr)+sizeof(float_t));
annotation = (char*)malloc(length); annotation = (char*)calloc(1, length);
memset(annotation, 0x00, length);
snprintf(annotation, length, graphText, snprintf(annotation, length, graphText,
g_GraphStart, g_GraphStart,
@ -805,8 +804,7 @@ void Plot::drawAnnotations(QRect annotationRect, QPainter *painter) {
char gridText[] = "GridX=%lf GridY=%lf (%s) GridXoffset=%lf"; char gridText[] = "GridX=%lf GridY=%lf (%s) GridXoffset=%lf";
length = (sizeof(gridText) + (sizeof(double)*3) + sizeof(gridLocked)); length = (sizeof(gridText) + (sizeof(double)*3) + sizeof(gridLocked));
annotation = (char*)malloc(length); annotation = (char*)calloc(1, length);
memset(annotation, 0x00, length);
snprintf(annotation, length, gridText, snprintf(annotation, length, gridText,
g_DefaultGridX, g_DefaultGridX,
@ -832,11 +830,8 @@ void Plot::drawAnnotations(QRect annotationRect, QPainter *painter) {
bool flag = false; bool flag = false;
size_t value; size_t value;
annotation = (char*)malloc(length); annotation = (char*)calloc(1, length);
char *textA = (char*)malloc(length); char *textA = (char*)calloc(1, length);
memset(annotation, 0x00, length);
memset(textA, 0x00, length);
strcat(textA, markerText); strcat(textA, markerText);
strcat(textA, " (%s%u)"); strcat(textA, " (%s%u)");
@ -867,8 +862,7 @@ void Plot::drawAnnotations(QRect annotationRect, QPainter *painter) {
length = ((sizeof(markerText))+(sizeof(uint32_t)*2)+1); length = ((sizeof(markerText))+(sizeof(uint32_t)*2)+1);
pos = g_MarkerB.pos; pos = g_MarkerB.pos;
annotation = (char*)malloc(length); annotation = (char*)calloc(1, length);
memset(annotation, 0x00, length);
snprintf(annotation, length, markerText, snprintf(annotation, length, markerText,
"B", "B",
@ -885,8 +879,7 @@ void Plot::drawAnnotations(QRect annotationRect, QPainter *painter) {
length = ((sizeof(markerText))+(sizeof(uint32_t)*2)+1); length = ((sizeof(markerText))+(sizeof(uint32_t)*2)+1);
pos = g_MarkerC.pos; pos = g_MarkerC.pos;
annotation = (char*)malloc(length); annotation = (char*)calloc(1, length);
memset(annotation, 0x00, length);
snprintf(annotation, length, markerText, snprintf(annotation, length, markerText,
"C", "C",
@ -903,8 +896,7 @@ void Plot::drawAnnotations(QRect annotationRect, QPainter *painter) {
length = ((sizeof(markerText))+(sizeof(uint32_t)*2)+1); length = ((sizeof(markerText))+(sizeof(uint32_t)*2)+1);
pos = g_MarkerD.pos; pos = g_MarkerD.pos;
annotation = (char*)malloc(length); annotation = (char*)calloc(1, length);
memset(annotation, 0x00, length);
snprintf(annotation, length, markerText, snprintf(annotation, length, markerText,
"D", "D",