Merge pull request #162 from marshmellow42/CoverityFixes

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index e8b72e81aeebe46884507d868bc3955fa81a2a75..e5cbc4aa11054fcd72a173af99a413d766362b2e 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -23,7 +23,7 @@ int ukbhit(void)
   static struct termios Otty, Ntty;
 
 
-  tcgetattr( 0, &Otty);
+  if ( tcgetattr( 0, &Otty) == -1 ) return -1;
   Ntty = Otty;
 
   Ntty.c_iflag          = 0;       /* input mode                */
@@ -140,9 +140,10 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
        size_t in_index = 0;
        // loop through the out_index to make sure we don't go too far
        for (size_t out_index=0; out_index < max_len; out_index++) {
-               // set character
-               sprintf(tmp++, "%u", data[in_index]);
-               // check if a line break is needed
+               // set character - (should be binary but verify it isn't more than 1 digit)
+               if (data[in_index]<10)
+                       sprintf(tmp++, "%u", data[in_index]);
+               // check if a line break is needed and we have room to print it in our array
                if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != max_len) ) {
                        // increment and print line break
                        out_index++;
@@ -271,7 +272,7 @@ char param_getchar(const char *line, int paramnum)
 
 uint8_t param_get8(const char *line, int paramnum)
 {
-       return param_get8ex(line, paramnum, 10, 0);
+       return param_get8ex(line, paramnum, 0, 10);
 }
 
 /**
@@ -497,3 +498,13 @@ void xor(unsigned char *dst, unsigned char *src, size_t len) {
 int32_t le24toh (uint8_t data[3]) {
     return (data[2] << 16) | (data[1] << 8) | data[0];
 }
+
+// RotateLeft - Ultralight, Desfire, works on byte level
+// 00-01-02  >> 01-02-00
+void rol(uint8_t *data, const size_t len){
+    uint8_t first = data[0];
+    for (size_t i = 0; i < len-1; i++) {
+        data[i] = data[i+1];
+    }
+    data[len-1] = first;
+}