ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-01-04 17:44:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: more env-signature checks.

Browse Source 
Change-Id: I0155821e9b03731f755e43640d8dc9e5c12acf62
This commit is contained in:
Leonid Yuriev 2019-08-11 22:54:06 +03:00
parent a6449f36f6
commit d6a2f98ef5
1 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/mdbx.c
View File

@ -6762,6 +6762,7 @@ int __cold mdbx_env_close_ex(MDBX_env *env, int dont_sync) {
if (unlikely(!env)) if (unlikely(!env))
return MDBX_EINVAL; return MDBX_EINVAL;
if (unlikely(env->me_signature != MDBX_ME_SIGNATURE)) if (unlikely(env->me_signature != MDBX_ME_SIGNATURE))
return MDBX_EBADSIGN; return MDBX_EBADSIGN;
@ -11874,6 +11875,12 @@ int __cold mdbx_env_copy(MDBX_env *env, const char *dest_path, unsigned flags) {
} }
int __cold mdbx_env_set_flags(MDBX_env *env, unsigned flags, int onoff) { int __cold mdbx_env_set_flags(MDBX_env *env, unsigned flags, int onoff) {
if (unlikely(!env))
return MDBX_EINVAL;
if (unlikely(env->me_signature != MDBX_ME_SIGNATURE))
return MDBX_EBADSIGN;
if (unlikely(flags & ~CHANGEABLE)) if (unlikely(flags & ~CHANGEABLE))
return MDBX_EINVAL; return MDBX_EINVAL;
@ -11894,6 +11901,9 @@ int __cold mdbx_env_get_flags(MDBX_env *env, unsigned *arg) {
if (unlikely(!env || !arg)) if (unlikely(!env || !arg))
return MDBX_EINVAL; return MDBX_EINVAL;
if (unlikely(env->me_signature != MDBX_ME_SIGNATURE))
return MDBX_EBADSIGN;
*arg = env->me_flags & (CHANGEABLE | CHANGELESS); *arg = env->me_flags & (CHANGEABLE | CHANGELESS);
return MDBX_SUCCESS; return MDBX_SUCCESS;
} }
@ -11901,6 +11911,10 @@ int __cold mdbx_env_get_flags(MDBX_env *env, unsigned *arg) {
int __cold mdbx_env_set_userctx(MDBX_env *env, void *ctx) { int __cold mdbx_env_set_userctx(MDBX_env *env, void *ctx) {
if (unlikely(!env)) if (unlikely(!env))
return MDBX_EINVAL; return MDBX_EINVAL;
if (unlikely(env->me_signature != MDBX_ME_SIGNATURE))
return MDBX_EBADSIGN;
env->me_userctx = ctx; env->me_userctx = ctx;
return MDBX_SUCCESS; return MDBX_SUCCESS;
} }
@ -11912,6 +11926,10 @@ void *__cold mdbx_env_get_userctx(MDBX_env *env) {
int __cold mdbx_env_set_assert(MDBX_env *env, MDBX_assert_func *func) { int __cold mdbx_env_set_assert(MDBX_env *env, MDBX_assert_func *func) {
if (unlikely(!env)) if (unlikely(!env))
return MDBX_EINVAL; return MDBX_EINVAL;
if (unlikely(env->me_signature != MDBX_ME_SIGNATURE))
return MDBX_EBADSIGN;
#if MDBX_DEBUG #if MDBX_DEBUG
env->me_assert_func = func; env->me_assert_func = func;
return MDBX_SUCCESS; return MDBX_SUCCESS;
@ -11925,6 +11943,9 @@ int __cold mdbx_env_get_path(MDBX_env *env, const char **arg) {
if (unlikely(!env || !arg)) if (unlikely(!env || !arg))
return MDBX_EINVAL; return MDBX_EINVAL;
if (unlikely(env->me_signature != MDBX_ME_SIGNATURE))
return MDBX_EBADSIGN;
*arg = env->me_path; *arg = env->me_path;
return MDBX_SUCCESS; return MDBX_SUCCESS;
} }
@ -11933,6 +11954,9 @@ int __cold mdbx_env_get_fd(MDBX_env *env, mdbx_filehandle_t *arg) {
if (unlikely(!env || !arg)) if (unlikely(!env || !arg))
return MDBX_EINVAL; return MDBX_EINVAL;
if (unlikely(env->me_signature != MDBX_ME_SIGNATURE))
return MDBX_EBADSIGN;
*arg = env->me_fd; *arg = env->me_fd;
return MDBX_SUCCESS; return MDBX_SUCCESS;
} }
@ -11957,6 +11981,10 @@ int __cold mdbx_env_stat(MDBX_env *env, MDBX_stat *arg, size_t bytes) {
if (unlikely(env == NULL || arg == NULL)) if (unlikely(env == NULL || arg == NULL))
return MDBX_EINVAL; return MDBX_EINVAL;
if (unlikely(env->me_signature != MDBX_ME_SIGNATURE))
return MDBX_EBADSIGN;
if (unlikely(bytes != sizeof(MDBX_stat))) if (unlikely(bytes != sizeof(MDBX_stat)))
return MDBX_EINVAL; return MDBX_EINVAL;
@ -11965,10 +11993,12 @@ int __cold mdbx_env_stat(MDBX_env *env, MDBX_stat *arg, size_t bytes) {
} }
int __cold mdbx_env_info(MDBX_env *env, MDBX_envinfo *arg, size_t bytes) { int __cold mdbx_env_info(MDBX_env *env, MDBX_envinfo *arg, size_t bytes) {
if (unlikely(env == NULL || arg == NULL)) if (unlikely(env == NULL || arg == NULL))
return MDBX_EINVAL; return MDBX_EINVAL;
if (unlikely(env->me_signature != MDBX_ME_SIGNATURE))
return MDBX_EBADSIGN;
if (bytes != sizeof(MDBX_envinfo)) if (bytes != sizeof(MDBX_envinfo))
return MDBX_EINVAL; return MDBX_EINVAL;
@ -12327,6 +12357,12 @@ static int mdbx_dbi_close_locked(MDBX_env *env, MDBX_dbi dbi) {
} }
int mdbx_dbi_close(MDBX_env *env, MDBX_dbi dbi) { int mdbx_dbi_close(MDBX_env *env, MDBX_dbi dbi) {
if (unlikely(!env))
return MDBX_EINVAL;
if (unlikely(env->me_signature != MDBX_ME_SIGNATURE))
return MDBX_EBADSIGN;
if (unlikely(dbi < CORE_DBS || dbi >= env->me_maxdbs)) if (unlikely(dbi < CORE_DBS || dbi >= env->me_maxdbs))
return MDBX_EINVAL; return MDBX_EINVAL;
@ -12653,8 +12689,12 @@ static int __cold mdbx_pid_insert(mdbx_pid_t *ids, mdbx_pid_t pid) {
} }
int __cold mdbx_reader_check(MDBX_env *env, int *dead) { int __cold mdbx_reader_check(MDBX_env *env, int *dead) {
if (unlikely(!env || env->me_signature != MDBX_ME_SIGNATURE)) if (unlikely(!env))
return MDBX_EINVAL; return MDBX_EINVAL;
if (unlikely(env->me_signature != MDBX_ME_SIGNATURE))
return MDBX_EBADSIGN;
if (dead) if (dead)
*dead = 0; *dead = 0;
return mdbx_reader_check0(env, false, dead); return mdbx_reader_check0(env, false, dead);