Differences From Artifact [b73e42773d]:
- File src/OFString+JSONParsing.m — part of check-in [d0ae3bfd6c] at 2020-10-25 23:33:09 on branch trunk — Add of_{malloc,calloc,realloc,free} (user: js, size: 13148) [annotate] [blame] [check-ins using]
To Artifact [6d4d4d10b0]:
- File
src/OFString+JSONParsing.m
— part of check-in
[3d8286feee]
at
2020-11-04 23:18:25
on branch trunk
— Remove of_free()
While it makes sense to wrap malloc and calloc to replace the error
checking with exceptions, it does not make sense to wrap free. (user: js, size: 13091) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
150 151 152 153 154 155 156 |
buffer = of_malloc(1, stop - *pointer);
while (*pointer < stop) {
/* Parse escape codes */
if (**pointer == '\\') {
if (++(*pointer) >= stop) {
| | | 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 |
buffer = of_malloc(1, stop - *pointer);
while (*pointer < stop) {
/* Parse escape codes */
if (**pointer == '\\') {
if (++(*pointer) >= stop) {
free(buffer);
return nil;
}
switch (**pointer) {
case '"':
case '\\':
case '/':
|
| ︙ | ︙ | |||
189 190 191 192 193 194 195 |
case 'u':;
of_char16_t c1, c2;
of_unichar_t c;
size_t l;
c1 = parseUnicodeEscape(*pointer - 1, stop);
if (c1 == 0xFFFF) {
| | | | | | | 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 |
case 'u':;
of_char16_t c1, c2;
of_unichar_t c;
size_t l;
c1 = parseUnicodeEscape(*pointer - 1, stop);
if (c1 == 0xFFFF) {
free(buffer);
return nil;
}
/* Low surrogate */
if ((c1 & 0xFC00) == 0xDC00) {
free(buffer);
return nil;
}
/* Normal character */
if ((c1 & 0xFC00) != 0xD800) {
l = of_string_utf8_encode(c1,
buffer + i);
if (l == 0) {
free(buffer);
return nil;
}
i += l;
*pointer += 5;
break;
}
/*
* If we are still here, we only got one UTF-16
* surrogate and now need to get the other one
* in order to produce UTF-8 and not CESU-8.
*/
c2 = parseUnicodeEscape(*pointer + 5, stop);
if (c2 == 0xFFFF) {
free(buffer);
return nil;
}
c = (((c1 & 0x3FF) << 10) |
(c2 & 0x3FF)) + 0x10000;
l = of_string_utf8_encode(c, buffer + i);
if (l == 0) {
free(buffer);
return nil;
}
i += l;
*pointer += 11;
break;
|
| ︙ | ︙ | |||
252 253 254 255 256 257 258 | break; case '\n': (*pointer)++; (*line)++; break; default: | | | | | | 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 |
break;
case '\n':
(*pointer)++;
(*line)++;
break;
default:
free(buffer);
return nil;
}
/* End of string found */
} else if (**pointer == delimiter) {
OFString *ret;
@try {
ret = [OFString stringWithUTF8String: buffer
length: i];
} @finally {
free(buffer);
}
(*pointer)++;
return ret;
/* Newlines in strings are disallowed */
} else if (**pointer == '\n' || **pointer == '\r') {
(*line)++;
free(buffer);
return nil;
} else {
buffer[i++] = **pointer;
(*pointer)++;
}
}
free(buffer);
return nil;
}
static inline OFString *
parseIdentifier(const char **pointer, const char *stop)
{
char *buffer;
|
| ︙ | ︙ | |||
306 307 308 309 310 311 312 |
(*pointer)++;
} else if (**pointer == '\\') {
of_char16_t c1, c2;
of_unichar_t c;
size_t l;
if (++(*pointer) >= stop || **pointer != 'u') {
| | | | | | | | | | | 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 |
(*pointer)++;
} else if (**pointer == '\\') {
of_char16_t c1, c2;
of_unichar_t c;
size_t l;
if (++(*pointer) >= stop || **pointer != 'u') {
free(buffer);
return nil;
}
c1 = parseUnicodeEscape(*pointer - 1, stop);
if (c1 == 0xFFFF) {
free(buffer);
return nil;
}
/* Low surrogate */
if ((c1 & 0xFC00) == 0xDC00) {
free(buffer);
return nil;
}
/* Normal character */
if ((c1 & 0xFC00) != 0xD800) {
l = of_string_utf8_encode(c1, buffer + i);
if (l == 0) {
free(buffer);
return nil;
}
i += l;
*pointer += 5;
continue;
}
/*
* If we are still here, we only got one UTF-16
* surrogate and now need to get the other one in order
* to produce UTF-8 and not CESU-8.
*/
c2 = parseUnicodeEscape(*pointer + 5, stop);
if (c2 == 0xFFFF) {
free(buffer);
return nil;
}
c = (((c1 & 0x3FF) << 10) | (c2 & 0x3FF)) + 0x10000;
l = of_string_utf8_encode(c, buffer + i);
if (l == 0) {
free(buffer);
return nil;
}
i += l;
*pointer += 11;
} else {
OFString *ret;
if (i == 0 || (buffer[0] >= '0' && buffer[0] <= '9')) {
free(buffer);
return nil;
}
@try {
ret = [OFString stringWithUTF8String: buffer
length: i];
} @finally {
free(buffer);
}
return ret;
}
}
/*
* It is never possible to end with an identifier, thus we should never
* reach stop.
*/
free(buffer);
return nil;
}
static inline OFMutableArray *
parseArray(const char **pointer, const char *stop, size_t *line,
size_t depthLimit)
{
|
| ︙ | ︙ |