Skip to content

Commit c4310fc

Browse files
swisspolswisspol
committed
Addressed static analyzer warnings
1 parent 33645d3 commit c4310fc

6 files changed

Lines changed: 42 additions & 14 deletions

File tree

‎GCDWebServer/Core/GCDWebServerRequest.m‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ @implementation GCDWebServerGZipDecoder
8888
- (BOOL)open:(NSError**)error {
8989
int result = inflateInit2(&_stream, 15 + 16);
9090
if (result != Z_OK) {
91-
*error = [NSError errorWithDomain:kZlibErrorDomain code:result userInfo:nil];
91+
if (error) {
92+
*error = [NSError errorWithDomain:kZlibErrorDomain code:result userInfo:nil];
93+
}
9294
return NO;
9395
}
9496
if (![super open:error]) {
@@ -114,7 +116,9 @@ - (BOOL)writeData:(NSData*)data error:(NSError**)error {
114116
_stream.avail_out = (uInt)maxLength;
115117
int result = inflate(&_stream, Z_NO_FLUSH);
116118
if ((result != Z_OK) && (result != Z_STREAM_END)) {
117-
*error = [NSError errorWithDomain:kZlibErrorDomain code:result userInfo:nil];
119+
if (error) {
120+
*error = [NSError errorWithDomain:kZlibErrorDomain code:result userInfo:nil];
121+
}
118122
return NO;
119123
}
120124
length += maxLength - _stream.avail_out;

‎GCDWebServer/Core/GCDWebServerResponse.m‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ - (id)initWithResponse:(GCDWebServerResponse*)response reader:(id<GCDWebServerBo
9494
- (BOOL)open:(NSError**)error {
9595
int result = deflateInit2(&_stream, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 15 + 16, 8, Z_DEFAULT_STRATEGY);
9696
if (result != Z_OK) {
97-
*error = [NSError errorWithDomain:kZlibErrorDomain code:result userInfo:nil];
97+
if (error) {
98+
*error = [NSError errorWithDomain:kZlibErrorDomain code:result userInfo:nil];
99+
}
98100
return NO;
99101
}
100102
if (![super open:error]) {
@@ -130,7 +132,9 @@ - (NSData*)readData:(NSError**)error {
130132
if (result == Z_STREAM_END) {
131133
_finished = YES;
132134
} else if (result != Z_OK) {
133-
*error = [NSError errorWithDomain:kZlibErrorDomain code:result userInfo:nil];
135+
if (error) {
136+
*error = [NSError errorWithDomain:kZlibErrorDomain code:result userInfo:nil];
137+
}
134138
return nil;
135139
}
136140
length += maxLength - _stream.avail_out;

‎GCDWebServer/Requests/GCDWebServerDataRequest.m‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ - (BOOL)open:(NSError**)error {
5151
_data = [[NSMutableData alloc] init];
5252
}
5353
if (_data == nil) {
54-
*error = [NSError errorWithDomain:kGCDWebServerErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey: @"Failed allocating memory"}];
54+
if (error) {
55+
*error = [NSError errorWithDomain:kGCDWebServerErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey: @"Failed allocating memory"}];
56+
}
5557
return NO;
5658
}
5759
return YES;

‎GCDWebServer/Requests/GCDWebServerFileRequest.m‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,23 +56,29 @@ - (void)dealloc {
5656
- (BOOL)open:(NSError**)error {
5757
_file = open([_temporaryPath fileSystemRepresentation], O_CREAT | O_TRUNC | O_WRONLY, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
5858
if (_file <= 0) {
59-
*error = GCDWebServerMakePosixError(errno);
59+
if (error) {
60+
*error = GCDWebServerMakePosixError(errno);
61+
}
6062
return NO;
6163
}
6264
return YES;
6365
}
6466

6567
- (BOOL)writeData:(NSData*)data error:(NSError**)error {
6668
if (write(_file, data.bytes, data.length) != (ssize_t)data.length) {
67-
*error = GCDWebServerMakePosixError(errno);
69+
if (error) {
70+
*error = GCDWebServerMakePosixError(errno);
71+
}
6872
return NO;
6973
}
7074
return YES;
7175
}
7276

7377
- (BOOL)close:(NSError**)error {
7478
if (close(_file) < 0) {
75-
*error = GCDWebServerMakePosixError(errno);
79+
if (error) {
80+
*error = GCDWebServerMakePosixError(errno);
81+
}
7682
return NO;
7783
}
7884
#ifdef __GCDWEBSERVER_ENABLE_TESTING__

‎GCDWebServer/Requests/GCDWebServerMultiPartFormRequest.m‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,15 +376,19 @@ - (BOOL)open:(NSError**)error {
376376
NSString* boundary = GCDWebServerExtractHeaderValueParameter(self.contentType, @"boundary");
377377
_parser = [[GCDWebServerMIMEStreamParser alloc] initWithBoundary:boundary defaultControlName:nil arguments:_arguments files:_files];
378378
if (_parser == nil) {
379-
*error = [NSError errorWithDomain:kGCDWebServerErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey: @"Failed starting to parse multipart form data"}];
379+
if (error) {
380+
*error = [NSError errorWithDomain:kGCDWebServerErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey: @"Failed starting to parse multipart form data"}];
381+
}
380382
return NO;
381383
}
382384
return YES;
383385
}
384386

385387
- (BOOL)writeData:(NSData*)data error:(NSError**)error {
386388
if (![_parser appendBytes:data.bytes length:data.length]) {
387-
*error = [NSError errorWithDomain:kGCDWebServerErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey: @"Failed continuing to parse multipart form data"}];
389+
if (error) {
390+
*error = [NSError errorWithDomain:kGCDWebServerErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey: @"Failed continuing to parse multipart form data"}];
391+
}
388392
return NO;
389393
}
390394
return YES;
@@ -394,7 +398,9 @@ - (BOOL)close:(NSError**)error {
394398
BOOL atEnd = [_parser isAtEnd];
395399
_parser = nil;
396400
if (!atEnd) {
397-
*error = [NSError errorWithDomain:kGCDWebServerErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey: @"Failed finishing to parse multipart form data"}];
401+
if (error) {
402+
*error = [NSError errorWithDomain:kGCDWebServerErrorDomain code:-1 userInfo:@{NSLocalizedDescriptionKey: @"Failed finishing to parse multipart form data"}];
403+
}
398404
return NO;
399405
}
400406
return YES;

‎GCDWebServer/Responses/GCDWebServerFileResponse.m‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,15 @@ - (instancetype)initWithFile:(NSString*)path byteRange:(NSRange)range isAttachme
142142
- (BOOL)open:(NSError**)error {
143143
_file = open([_path fileSystemRepresentation], O_NOFOLLOW | O_RDONLY);
144144
if (_file <= 0) {
145-
*error = GCDWebServerMakePosixError(errno);
145+
if (error) {
146+
*error = GCDWebServerMakePosixError(errno);
147+
}
146148
return NO;
147149
}
148150
if (lseek(_file, _offset, SEEK_SET) != (off_t)_offset) {
149-
*error = GCDWebServerMakePosixError(errno);
151+
if (error) {
152+
*error = GCDWebServerMakePosixError(errno);
153+
}
150154
close(_file);
151155
return NO;
152156
}
@@ -158,7 +162,9 @@ - (NSData*)readData:(NSError**)error {
158162
NSMutableData* data = [[NSMutableData alloc] initWithLength:length];
159163
ssize_t result = read(_file, data.mutableBytes, length);
160164
if (result < 0) {
161-
*error = GCDWebServerMakePosixError(errno);
165+
if (error) {
166+
*error = GCDWebServerMakePosixError(errno);
167+
}
162168
return nil;
163169
}
164170
if (result > 0) {

0 commit comments

Comments
 (0)