浏览代码

yarrow: prevent access to NULL pointer

Steffen Jaeckel 13 年之前
父节点
当前提交
77860ba866
共有 1 个文件被更改,包括 6 次插入4 次删除
  1. 6 4
      src/prngs/yarrow.c

+ 6 - 4
src/prngs/yarrow.c

@@ -343,11 +343,13 @@ int yarrow_test(void)
    }
    }
 
 
    /* now let's test the hash/cipher that was chosen */
    /* now let's test the hash/cipher that was chosen */
-   if ((err = cipher_descriptor[prng.yarrow.cipher].test()) != CRYPT_OK) {
-      return err; 
+   if (cipher_descriptor[prng.yarrow.cipher].test &&
+       ((err = cipher_descriptor[prng.yarrow.cipher].test()) != CRYPT_OK)) {
+      return err;
    }
    }
-   if ((err = hash_descriptor[prng.yarrow.hash].test()) != CRYPT_OK) {
-      return err; 
+   if (hash_descriptor[prng.yarrow.hash].test &&
+       ((err = hash_descriptor[prng.yarrow.hash].test()) != CRYPT_OK)) {
+      return err;
    }
    }
 
 
    return CRYPT_OK;
    return CRYPT_OK;