merge

diff --cc tests/largeDictionary.c
index 998fd9fa85c69a2a79011e7530bb31b8237eda9b,a3b96135f786a2a2f75ff5c2ad035842fc0e3955..30ff98d98b478215920244dc0aaa18c34c93434f
--- 1/tests/largeDictionary.c
--- 2/tests/largeDictionary.c
+++ b/tests/largeDictionary.c
@@@ -70,9 -70,9 +70,10 @@@ int main(int argc, const char** argv
      char* buffer = (char*)malloc(bufferSize);
      void* out = malloc(outSize);
      void* roundtrip = malloc(dataSize);
 +    int _exit_code = 1;
      (void)argc;
      (void)argv;
+     int _exit_code = 0;
  
      if (!buffer || !out || !roundtrip || !cctx || !dctx) {
          fprintf(stderr, "Allocation failure\n");
@@@ -127,4 -154,4 +128,5 @@@ cleanup
      ZSTD_freeDCtx(dctx);
      ZSTD_freeCCtx(cctx);
      return _exit_code;
++    return _exit_code;
  }