0001-Fix-maybe-uninitialized-errors.patch 2.7 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182
  1. From bcb39d6f4d2dee6beb035cb2f3618174ec1cb2b0 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= <jose.pekkarinen@unikie.com>
  3. Date: Fri, 10 Dec 2021 13:54:26 +0200
  4. Subject: [PATCH] Fix maybe uninitialized errors
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. Signed-off-by: José Pekkarinen <jose.pekkarinen@unikie.com>
  9. Upstream: https://github.com/OpenSC/OpenSC/commit/05ec8c7fe785a2b9aeaac1164adb349df42b7f80
  10. ---
  11. src/libopensc/pkcs15-coolkey.c | 12 ++++++------
  12. src/pkcs15init/pkcs15-asepcos.c | 2 +-
  13. src/tools/opensc-explorer.c | 2 +-
  14. 3 files changed, 8 insertions(+), 8 deletions(-)
  15. diff --git a/src/libopensc/pkcs15-coolkey.c b/src/libopensc/pkcs15-coolkey.c
  16. index 586475dd..15684cef 100644
  17. --- a/src/libopensc/pkcs15-coolkey.c
  18. +++ b/src/libopensc/pkcs15-coolkey.c
  19. @@ -147,9 +147,9 @@ coolkey_find_matching_cert(sc_card_t *card, sc_cardctl_coolkey_object_t *in_obj,
  20. static int
  21. coolkey_get_attribute_ulong(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, CK_ULONG *value)
  22. {
  23. - const u8 *val;
  24. - size_t val_len;
  25. - u8 data_type;
  26. + const u8 *val = NULL;
  27. + size_t val_len = 0;
  28. + u8 data_type = 0;
  29. int r;
  30. r = coolkey_get_attribute(card, obj, type, &val, &val_len, &data_type);
  31. @@ -168,8 +168,8 @@ static int
  32. coolkey_get_attribute_boolean(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE attr_type)
  33. {
  34. int r;
  35. - const u8 *val;
  36. - size_t val_len;
  37. + const u8 *val = NULL;
  38. + size_t val_len = 0;
  39. r = coolkey_get_attribute(card, obj, attr_type, &val, &val_len, NULL);
  40. if (r < 0) {
  41. @@ -186,7 +186,7 @@ static int
  42. coolkey_get_attribute_bytes(sc_card_t *card, sc_cardctl_coolkey_object_t *obj, CK_ATTRIBUTE_TYPE type, u8 *data, size_t *data_len, size_t max_data_len)
  43. {
  44. const u8 *val;
  45. - size_t val_len;
  46. + size_t val_len = 0;
  47. int r;
  48. r = coolkey_get_attribute(card, obj, type, &val, &val_len, NULL);
  49. diff --git a/src/pkcs15init/pkcs15-asepcos.c b/src/pkcs15init/pkcs15-asepcos.c
  50. index d7122012..bc0efb5c 100644
  51. --- a/src/pkcs15init/pkcs15-asepcos.c
  52. +++ b/src/pkcs15init/pkcs15-asepcos.c
  53. @@ -221,7 +221,7 @@ static int asepcos_do_store_pin(sc_profile_t *profile, sc_card_t *card,
  54. {
  55. sc_file_t *nfile = NULL;
  56. u8 buf[64], sbuf[64], *p = buf, *q = sbuf;
  57. - int r, akn;
  58. + int r, akn = 0;
  59. if (auth_info->auth_type != SC_PKCS15_PIN_AUTH_TYPE_PIN)
  60. return SC_ERROR_OBJECT_NOT_VALID;
  61. diff --git a/src/tools/opensc-explorer.c b/src/tools/opensc-explorer.c
  62. index 9ec4daa1..04efdf8f 100644
  63. --- a/src/tools/opensc-explorer.c
  64. +++ b/src/tools/opensc-explorer.c
  65. @@ -2472,7 +2472,7 @@ int main(int argc, char *argv[])
  66. char *line;
  67. int cargc;
  68. char *cargv[260];
  69. - int multiple;
  70. + int multiple = 0;
  71. struct command *cmd;
  72. char prompt[3*SC_MAX_PATH_STRING_SIZE];
  73. --
  74. 2.25.1