github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-16 02:03:00 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #164 from marshmellow42/master

Browse source 
fix issue #163, prevent two calls to getFromGraphBuf - fix char array pointer...
This commit is contained in:
Martin Holst Swende 2016-02-16 15:39:52 +01:00
commit b12f076b0d
1 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

42
client/cmddata.c
View file

@ -919,19 +919,21 @@ int CmdDetectClockRate(const char *Cmd)
char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert) char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)
{ {
char *fskType; static char fType[8];
memset(fType, 0x00, 8);
char *fskType = fType;
if (fchigh==10 && fclow==8){ if (fchigh==10 && fclow==8){
if (invert) //fsk2a if (invert) //fsk2a
fskType = "FSK2a"; memcpy(fskType, "FSK2a", 5);
else //fsk2 else //fsk2
fskType = "FSK2"; memcpy(fskType, "FSK2", 4);
} else if (fchigh == 8 && fclow == 5) { } else if (fchigh == 8 && fclow == 5) {
if (invert) if (invert)
fskType = "FSK1"; memcpy(fskType, "FSK1", 4);
else else
fskType = "FSK1a"; memcpy(fskType, "FSK1a", 5);
} else { } else {
fskType = "FSK??"; memcpy(fskType, "FSK??", 5);
} }
return fskType; return fskType;
} }
@ -951,42 +953,42 @@ int FSKrawDemod(const char *Cmd, bool verbose)
fchigh = param_get8(Cmd, 2); fchigh = param_get8(Cmd, 2);
fclow = param_get8(Cmd, 3); fclow = param_get8(Cmd, 3);
if (strlen(Cmd)>0 && strlen(Cmd)<=2) { if (strlen(Cmd)>0 && strlen(Cmd)<=2) {
if (rfLen==1){ if (rfLen==1) {
invert = 1; //if invert option only is used invert = 1; //if invert option only is used
rfLen = 0; rfLen = 0;
} }
} }
uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0}; uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
size_t BitLen = getFromGraphBuf(BitStream); size_t BitLen = getFromGraphBuf(BitStream);
if (BitLen==0) return 0; if (BitLen==0) return 0;
if (g_debugMode==2) PrintAndLog("DEBUG: Got samples");
//get field clock lengths //get field clock lengths
uint8_t fc1=0, fc2=0, rf1=0; uint16_t fcs=0;
if (!fchigh || !fclow) { if (!fchigh || !fclow) {
uint8_t ans = fskClocks(&fc1, &fc2, &rf1, false); fcs = countFC(BitStream, BitLen, 1);
if (ans == 0) { if (!fcs) {
if (g_debugMode) PrintAndLog("\nError: cannot detect valid fsk field clocks"); fchigh = 10;
return 0; // can't detect field clock fclow = 8;
} else {
fchigh = (fcs >> 8) & 0x00FF;
fclow = fcs & 0x00FF;
} }
fchigh = fc1;
fclow = fc2;
if (rfLen == 0) rfLen = rf1;
} }
//get bit clock length //get bit clock length
if (!rfLen){ if (!rfLen) {
rfLen = detectFSKClk(BitStream, BitLen, fchigh, fclow); rfLen = detectFSKClk(BitStream, BitLen, fchigh, fclow);
if (!rfLen) rfLen = 50; if (!rfLen) rfLen = 50;
} }
int size = fskdemod(BitStream, BitLen, rfLen, invert, fchigh, fclow); int size = fskdemod(BitStream, BitLen, rfLen, invert, fchigh, fclow);
if (size > 0){ if (size > 0) {
setDemodBuf(BitStream,size,0); setDemodBuf(BitStream,size,0);
// Now output the bitstream to the scrollback by line of 16 bits // Now output the bitstream to the scrollback by line of 16 bits
if (verbose || g_debugMode) { if (verbose || g_debugMode) {
PrintAndLog("\nUsing Clock:%hu, invert:%hu, fchigh:%hu, fclow:%hu", rfLen, invert, fchigh, fclow); PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", (unsigned int)rfLen, (unsigned int)invert, (unsigned int)fchigh, (unsigned int)fclow);
PrintAndLog("%s decoded bitstream:",GetFSKType(fchigh,fclow,invert)); PrintAndLog("%s decoded bitstream:",GetFSKType(fchigh,fclow,invert));
printDemodBuff(); printDemodBuff();
} }
return 1; return 1;
} else { } else {
if (g_debugMode) PrintAndLog("no FSK data found"); if (g_debugMode) PrintAndLog("no FSK data found");