Commit 6b1c8a81 authored by Brian R. Bondy's avatar Brian R. Bondy Committed by Georg Koppen
Browse files

Bug 973933 - Fix libmar warnings. r=rstrong. a=Callek 

--HG--
extra : amend_source : 27417e9f4e775cded600fae95f17faad4bb73b47
parent e94da510

modules/libmar/tool/mar.c

+5 −5
Original line number Diff line number Diff line
@@ -117,23 +117,23 @@ int main(int argc, char **argv) { 
  const char *certNames[MAX_SIGNATURES];

  char *MARChannelID = MAR_CHANNEL_ID;

  char *productVersion = MOZ_APP_VERSION;

  uint32_t i, k;

  uint32_t k;

  int rv = -1;

  uint32_t certCount = 0;

  int32_t sigIndex = -1;



#if !defined(NO_SIGN_VERIFY)

  uint32_t fileSizes[MAX_SIGNATURES];

  uint8_t* certBuffers[MAX_SIGNATURES];

  const uint8_t* certBuffers[MAX_SIGNATURES];

  char* DERFilePaths[MAX_SIGNATURES];

#if (!defined(XP_WIN) && !defined(XP_MACOSX)) || defined(MAR_NSS)

  CERTCertificate* certs[MAX_SIGNATURES];

#endif

#endif



  memset(certNames, 0, sizeof(certNames));

  memset((void*)certNames, 0, sizeof(certNames));

#if defined(XP_WIN) && !defined(MAR_NSS) && !defined(NO_SIGN_VERIFY)

  memset(certBuffers, 0, sizeof(certBuffers));

  memset((void*)certBuffers, 0, sizeof(certBuffers));

#endif

#if !defined(NO_SIGN_VERIFY) && ((!defined(MAR_NSS) && defined(XP_WIN)) || \

                                 defined(XP_MACOSX))
@@ -376,7 +376,7 @@ int main(int argc, char **argv) { 
    }

    for (k = 0; k < certCount; ++k) {

#if (defined(XP_WIN) || defined(XP_MACOSX)) && !defined(MAR_NSS)

      free(certBuffers[k]);

      free((void*)certBuffers[k]);

#else

      /* certBuffers[k] is owned by certs[k] so don't free it */

      CERT_DestroyCertificate(certs[k]);