Merge branch 'dev' of github.com:facebook/zstd into dev

2017-02-15 12:00:50 -08:00
parent 4596037042 44f82d781f
commit 2252d29a5a
8 changed files with 30 additions and 39 deletions
@@ -2512,7 +2512,7 @@ static size_t ZSTD_loadDictionaryContent(ZSTD_CCtx* zc, const void* src, size_t
        return ERROR(GENERIC);   /* strategy doesn't exist; impossible */
    }

-    zc->nextToUpdate = zc->loadedDictEnd;
+    zc->nextToUpdate = (U32)(iend - zc->base);
    return 0;
 }