Skip to content

Commit 8f759fc

Browse files
committed
fix typo
close filehandle only if we opened one
1 parent 6d3bd66 commit 8f759fc

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

kubernetes/config/kube_config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ int load_kube_config_common(char **pBasePath, sslConfig_t ** pSslConfig, list_t
314314

315315
rc = kubeyaml_load_kubeconfig(kubeconfig);
316316
if (0 != rc) {
317-
fprintf(stderr, "%s: Cannot load the kubeconfig %s\n", fname, kubeconfig->fileName);
317+
fprintf(stderr, "%s: Cannot load the kubeconfig %s\n", fname, kubeconfig->fileName?kubeconfig->fileName:kubeconfig->buffer);
318318
rc = -1;
319319
goto end;
320320
}

kubernetes/config/kube_config_yaml.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -438,10 +438,11 @@ int kubeyaml_load_kubeconfig(kubeconfig_t * kubeconfig)
438438
fprintf(stderr, "%s: Cannot open the file %s.[%s]\n", fname, kubeconfig->fileName, strerror(errno));
439439
return -1;
440440
}
441+
}
441442
else if (kubeconfig->buffer) {
442443
// Nothing to do here for now.
443444
}
444-
} else {
445+
else {
445446
fprintf(stderr, "%s: The kubeconf file name needs be set by kubeconfig->fileName .\n", fname);
446447
return -1;
447448
}
@@ -477,12 +478,16 @@ int kubeyaml_load_kubeconfig(kubeconfig_t * kubeconfig)
477478

478479
/* Cleanup */
479480
yaml_parser_delete(&parser);
480-
fclose(input);
481+
if (input) {
482+
fclose(input);
483+
}
481484
return 0;
482485

483486
error:
484487
yaml_parser_delete(&parser);
485-
fclose(input);
488+
if (input) {
489+
fclose(input);
490+
}
486491
return -1;
487492
}
488493

0 commit comments

Comments
 (0)