Fixing RDB_reportError format mismatch arguments

redis · Dec 11, 2023 · 52ea0d5 · 52ea0d5
1 parent 5427582
commit 52ea0d5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/api/librdb-api.h b/api/librdb-api.h
@@ -11,6 +11,10 @@ extern "C" {
 #define _LIBRDB_API __attribute__((visibility("default")))
 #endif
 
+#ifndef __GNUC__
+#define __attribute__(a)
+#endif
+
 typedef char *RdbBulk;
 typedef char *RdbBulkCopy;
 
@@ -472,7 +476,8 @@ _LIBRDB_API void RDB_pauseParser(RdbParser *p);
  ****************************************************************/
 _LIBRDB_API RdbRes RDB_getErrorCode(RdbParser *p);
 _LIBRDB_API const char *RDB_getErrorMessage(RdbParser *p);
-_LIBRDB_API void RDB_reportError(RdbParser *p, RdbRes e, const char *msg, ...);
+_LIBRDB_API void RDB_reportError(RdbParser *p, RdbRes e, const char *msg, ...)
+                                        __attribute__((format(printf, 3, 4)));
 
 /****************************************************************
  * Memory management

diff --git a/src/ext/readerFile.c b/src/ext/readerFile.c
@@ -49,8 +49,7 @@ RdbxReaderFile *RDBX_createReaderFile(RdbParser *p, const char *filename) {
     FILE *f;
 
     if (filename == NULL) {
-        RDB_reportError(p, RDB_ERR_FAILED_OPEN_RDB_FILE,
-                        "Filename is not provided", filename);
+        RDB_reportError(p, RDB_ERR_FAILED_OPEN_RDB_FILE, "Filename is not provided");
         return NULL;
     }
 

diff --git a/src/ext/respToFileWriter.c b/src/ext/respToFileWriter.c
@@ -20,7 +20,7 @@ static int respFileWritev(void *context, struct iovec *iov, int count,
     /* not optimized code */
     for (int i = 0 ; i < count ; ++i) {
         if (unlikely(fwrite(iov[i].iov_base, sizeof(char), iov[i].iov_len, ctx->filePtr) != iov[i].iov_len)) {
-            RDB_reportError(ctx->p, (RdbRes) RDBX_ERR_RESP_WRITE, "Failed to write RESP to file: %s (errno=%d)", errno);
+            RDB_reportError(ctx->p, (RdbRes) RDBX_ERR_RESP_WRITE, "Failed to write RESP to file: (errno=%d)", errno);
             return 1;
         }
     }

diff --git a/src/lib/parser.c b/src/lib/parser.c
@@ -345,7 +345,7 @@ _LIBRDB_API size_t RDB_bulkLen(RdbParser *p, RdbBulk b) {
     }
 
     RDB_reportError(p, RDB_ERR_INVALID_BULK_LENGTH_REQUEST,
-                    "Invalid RDB_bulkLen() request. Couldn't find application-bulk with address: %p", b);
+                    "Invalid RDB_bulkLen() request. Couldn't find application-bulk with address: %p", (void*)b);
 
     return 0;
 }
@@ -363,7 +363,7 @@ _LIBRDB_API int RDB_isRefBulk(RdbParser *p, RdbBulk b) {
     }
 
     RDB_reportError(p, RDB_ERR_INVALID_IS_REF_BULK,
-                    "Invalid RDB_isRefBulk() request. Couldn't find application-bulk with address: %p", b);
+                    "Invalid RDB_isRefBulk() request. Couldn't find application-bulk with address: %p", (void*)b);
     return 0;
 }
 
@@ -375,7 +375,7 @@ _LIBRDB_API RdbBulkCopy RDB_bulkClone(RdbParser *p, RdbBulk b) {
     }
 
     RDB_reportError(p, RDB_ERR_INVALID_BULK_CLONE_REQUEST,
-                    "Invalid RDB_bulkClone() request. Couldn't find application-bulk with address: %p", b);
+                    "Invalid RDB_bulkClone() request. Couldn't find application-bulk with address: %p", (void*)b);
 
     return NULL;
 }
@@ -1980,7 +1980,7 @@ RdbStatus elementEndOfFile(RdbParser *p) {
             if (cksum == 0) {
                 RDB_log(p, RDB_LOG_WRN, "RDB file was saved with checksum disabled: no check performed.");
             } else if (cksum != evaluated) {
-                RDB_reportError(p, RDB_ERR_CHECKSUM_FAILURE, "Wrong RDB checksum checksum=%lx, evaluated=%lx",
+                RDB_reportError(p, RDB_ERR_CHECKSUM_FAILURE, "Wrong RDB checksum checksum=%llx, evaluated=%llx",
                                 (unsigned long long) cksum,
                                 (unsigned long long) p->checksum);
                 return RDB_STATUS_ERROR;
@@ -2042,7 +2042,7 @@ RdbStatus elementModule(RdbParser *p) {
                     IF_NOT_OK_RETURN(rdbLoadLen(p, NULL, &when, NULL, NULL));
                     if (unlikely(when_opcode != RDB_MODULE_OPCODE_UINT)) {
                         RDB_reportError(p, RDB_ERR_MODULE_INVALID_WHEN_OPCODE,
-                            "elementModule() : Invalid when opcode: %d.", when_opcode);
+                            "elementModule() : Invalid when opcode: %ld.", when_opcode);
                         return RDB_STATUS_ERROR;
                     }
                 }
@@ -2588,7 +2588,7 @@ RdbStatus rdbLoadString(RdbParser *p, AllocTypeRq type, char *refBuf, BulkInfo *
                 return rdbLoadLzfString(p, type, refBuf, binfo);
             default:
                 RDB_reportError(p, RDB_ERR_STRING_UNKNOWN_ENCODING_TYPE,
-                                "rdbLoadString(): Unknown RDB string encoding type: %llu",len);
+                                "rdbLoadString(): Unknown RDB string encoding type: %lu",len);
                 return RDB_STATUS_ERROR;
         }
     }

diff --git a/src/lib/parserRaw.c b/src/lib/parserRaw.c
@@ -315,7 +315,7 @@ RdbStatus elementRawString(RdbParser *p) {
                         break;
                     default:
                         RDB_reportError(p, RDB_ERR_STRING_UNKNOWN_ENCODING_TYPE,
-                            "elementRawString(): Unknown RDB string encoding type: %llu", strCtx->len);
+                            "elementRawString(): Unknown RDB string encoding type: %lu", strCtx->len);
                         return RDB_STATUS_ERROR;
                 }
             }
@@ -419,7 +419,7 @@ RdbStatus elementRawString(RdbParser *p) {
             }
 
             RDB_reportError(p, RDB_ERR_STRING_UNKNOWN_ENCODING_TYPE,
-                           "elementRawString(): Unknown RDB string encoding type: %llu", strCtx->encoding);
+                           "elementRawString(): Unknown RDB string encoding type: %lu", strCtx->encoding);
             return RDB_STATUS_ERROR;
         }
 
@@ -694,7 +694,7 @@ RdbStatus elementRawModule(RdbParser *p) {
                 IF_NOT_OK_RETURN(rdbLoadLen(p, NULL, &ma->when, NULL, NULL));
                 if (unlikely(ma->when_opcode != RDB_MODULE_OPCODE_UINT)) {
                     RDB_reportError(p, RDB_ERR_MODULE_INVALID_WHEN_OPCODE,
-                                    "elementRawModule() : Invalid when opcode: %d.", ma->when_opcode);
+                                    "elementRawModule() : Invalid when opcode: %ld.", ma->when_opcode);
                     return RDB_STATUS_ERROR;
                 }
                 /*** ENTER SAFE STATE ***/