Merge pull request #159 from 4zv4l/check_openFile

check open file before close() for host_model_info
This commit is contained in:
TheDarkBug 2021-11-03 14:53:41 +01:00 committed by GitHub
commit e941d81815
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -666,9 +666,10 @@ void get_info()
#else #else
FILE *cpuinfo = popen("sysctl -a | egrep -i 'hw.model'", "r"); FILE *cpuinfo = popen("sysctl -a | egrep -i 'hw.model'", "r");
#endif #endif
FILE *host_model_info = fopen("/sys/devices/virtual/dmi/id/board_name", "r"); FILE *host_model_info = fopen("/sys/devices/virtual/dmi/id/board_name", "r"); // first try open the file
if (!host_model_info) if (!host_model_info) // if failed
if ((host_model_info = fopen("/sys/devices/virtual/dmi/id/product_name", "r")) != NULL) host_model_info = fopen("/sys/devices/virtual/dmi/id/product_name", "r"); // try open another file
if(host_model_info) // if one of the file could be open then close it
fclose(host_model_info); fclose(host_model_info);
#ifdef __WINDOWS__ #ifdef __WINDOWS__
host_model_info = popen("wmic computersystem get model", "r"); host_model_info = popen("wmic computersystem get model", "r");