Skip to content

Commit 66d6651

Browse files
author
Rémi Denis-Courmont
committed
rar: small code factor
1 parent be01663 commit 66d6651

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

modules/access/rar/rar.c

+4-10
Original file line numberDiff line numberDiff line change
@@ -364,28 +364,22 @@ int RarParse(stream_t *s, int *count, rar_file_t ***file, unsigned int *pi_nbvol
364364
has_next = 1;
365365
if (vol != s)
366366
stream_Delete(vol);
367+
free(volume_mrl);
367368

368-
if (!has_next || !pattern) {
369-
free(volume_mrl);
369+
if (!has_next || !pattern)
370370
return VLC_SUCCESS;
371-
}
372371

373372
/* Open next volume */
374373
const int volume_index = pattern->start + volume_offset++;
375-
if (volume_index > pattern->stop) {
376-
free(volume_mrl);
374+
if (volume_index > pattern->stop)
377375
return VLC_SUCCESS;
378-
}
379376

380377
char *volume_base;
381378
if (asprintf(&volume_base, "%s://%.*s",
382379
s->psz_access,
383-
(int)(strlen(s->psz_path) - strlen(pattern->match)), s->psz_path) < 0) {
384-
free(volume_mrl);
380+
(int)(strlen(s->psz_path) - strlen(pattern->match)), s->psz_path) < 0)
385381
return VLC_SUCCESS;
386-
}
387382

388-
free(volume_mrl);
389383
if (pattern->start) {
390384
if (asprintf(&volume_mrl, pattern->format, volume_base, volume_index) < 0)
391385
volume_mrl = NULL;

0 commit comments

Comments
 (0)