Proxmark/proxmark3
1
1
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2024-09-21 23:36:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

enforce askdemod argument 0 or 1

Browse source
This commit is contained in:
adam@algroup.co.uk 2009-09-02 09:17:34 +00:00
parent 3cc63bdf91
commit c2c80de8ab
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
winsrc/command.cpp
View file

@ -2272,9 +2272,11 @@ static void Cmdaskdemod(char *str) {
int c, high = 0, low = 0; int c, high = 0, low = 0;
// TODO: complain if we do not give 2 arguments here ! // TODO: complain if we do not give 2 arguments here !
// (AL - this doesn't make sense! we're only using one argument!!!)
sscanf(str, "%i", &c); sscanf(str, "%i", &c);
/* Detect high and lows and clock */ /* Detect high and lows and clock */
// (AL - clock???)
for (i = 0; i < GraphTraceLen; i++) for (i = 0; i < GraphTraceLen; i++)
{ {
if (GraphBuffer[i] > high) if (GraphBuffer[i] > high)
@ -2282,6 +2284,10 @@ static void Cmdaskdemod(char *str) {
else if (GraphBuffer[i] < low) else if (GraphBuffer[i] < low)
low = GraphBuffer[i]; low = GraphBuffer[i];
} }
if(c != 0 && c != 1) {
PrintToScrollback("Invalid argument: %s",str);
return;
}
if (GraphBuffer[0] > 0) { if (GraphBuffer[0] > 0) {
GraphBuffer[0] = 1-c; GraphBuffer[0] = 1-c;
@ -2829,7 +2835,7 @@ static struct {
char *docString; char *docString;
} CommandTable[] = { } CommandTable[] = {
{"amp", CmdAmp, 1, "Amplify peaks"}, {"amp", CmdAmp, 1, "Amplify peaks"},
{"askdemod", Cmdaskdemod, 1, "<samples per bit> <0|1> -- Attempt to demodulate simple ASK tags"}, {"askdemod", Cmdaskdemod, 1, "<0|1> -- Attempt to demodulate simple ASK tags"},
{"autocorr", CmdAutoCorr, 1, "<window length> -- Autocorrelation over window"}, {"autocorr", CmdAutoCorr, 1, "<window length> -- Autocorrelation over window"},
{"bitsamples", CmdBitsamples, 0, "Get raw samples as bitstring"}, {"bitsamples", CmdBitsamples, 0, "Get raw samples as bitstring"},
{"bitstream", Cmdbitstream, 1, "[clock rate] -- Convert waveform into a bitstream"}, {"bitstream", Cmdbitstream, 1, "[clock rate] -- Convert waveform into a bitstream"},