From 8f759fcfb7a41f3993331ad1d4c68237430828be Mon Sep 17 00:00:00 2001 From: DanyT Date: Tue, 2 Jul 2024 11:58:32 +0300 Subject: [PATCH] fix typo close filehandle only if we opened one --- kubernetes/config/kube_config.c | 2 +- kubernetes/config/kube_config_yaml.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/kubernetes/config/kube_config.c b/kubernetes/config/kube_config.c index 5383c65..c32ce1a 100644 --- a/kubernetes/config/kube_config.c +++ b/kubernetes/config/kube_config.c @@ -314,7 +314,7 @@ int load_kube_config_common(char **pBasePath, sslConfig_t ** pSslConfig, list_t rc = kubeyaml_load_kubeconfig(kubeconfig); if (0 != rc) { - fprintf(stderr, "%s: Cannot load the kubeconfig %s\n", fname, kubeconfig->fileName); + fprintf(stderr, "%s: Cannot load the kubeconfig %s\n", fname, kubeconfig->fileName?kubeconfig->fileName:kubeconfig->buffer); rc = -1; goto end; } diff --git a/kubernetes/config/kube_config_yaml.c b/kubernetes/config/kube_config_yaml.c index 21ffe29..94421f9 100644 --- a/kubernetes/config/kube_config_yaml.c +++ b/kubernetes/config/kube_config_yaml.c @@ -438,10 +438,11 @@ int kubeyaml_load_kubeconfig(kubeconfig_t * kubeconfig) fprintf(stderr, "%s: Cannot open the file %s.[%s]\n", fname, kubeconfig->fileName, strerror(errno)); return -1; } + } else if (kubeconfig->buffer) { // Nothing to do here for now. } - } else { + else { fprintf(stderr, "%s: The kubeconf file name needs be set by kubeconfig->fileName .\n", fname); return -1; } @@ -477,12 +478,16 @@ int kubeyaml_load_kubeconfig(kubeconfig_t * kubeconfig) /* Cleanup */ yaml_parser_delete(&parser); - fclose(input); + if (input) { + fclose(input); + } return 0; error: yaml_parser_delete(&parser); - fclose(input); + if (input) { + fclose(input); + } return -1; }