Fixed wrong sizeof's

This commit is contained in:
2019-04-04 13:10:36 +02:00
parent 0e651eaeed
commit f016765441
2 changed files with 11 additions and 8 deletions
+6 -6
View File
@@ -7658,12 +7658,12 @@ void show_html_header(LOGBOOK * lbs, BOOL expires, char *title, BOOL close_head,
else if (lbs == NULL && getcfg("global", "CSS", str, sizeof(str)))
strlcpy(css, str, sizeof(css));
strlcpy(file_name, resource_dir, sizeof(str));
strlcat(file_name, "themes", sizeof(str));
strlcat(file_name, DIR_SEPARATOR_STR, sizeof(str));
strlcat(file_name, theme_name, sizeof(str));
strlcat(file_name, DIR_SEPARATOR_STR, sizeof(str));
strlcat(file_name, css, sizeof(str));
strlcpy(file_name, resource_dir, sizeof(file_name));
strlcat(file_name, "themes", sizeof(file_name));
strlcat(file_name, DIR_SEPARATOR_STR, sizeof(file_name));
strlcat(file_name, theme_name, sizeof(file_name));
strlcat(file_name, DIR_SEPARATOR_STR, sizeof(file_name));
strlcat(file_name, css, sizeof(file_name));
FILE *f = fopen(file_name, "rb");
if (f != NULL) {
+5 -2
View File
@@ -155,15 +155,16 @@
D52BA2F113999DB0000458E3 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0930;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = PSI;
};
buildConfigurationList = D52BA2F413999DB0000458E3 /* Build configuration list for PBXProject "elogd" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = D52BA2EF13999DB0000458E3;
productRefGroup = D52BA2FB13999DB0000458E3 /* Products */;
@@ -212,6 +213,7 @@
D52BA30113999DB0000458E3 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
@@ -253,6 +255,7 @@
D52BA30213999DB0000458E3 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;