Skip to content

Commit f66affa

Browse files
committed
タグフィールド名に「~」を使えないようにさせる
https://www.xiph.org/vorbis/doc/v-comment.html#vectorformat なぜアスキー印字可能文字で「~」だけ禁止する必要があったのか…… これで、以前のバージョンのopuscommentで作られたファイルは-Vオプションで撥ねられる可能性を含ませてしまった
1 parent 4b0aed0 commit f66affa

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

nls/C/5.tagerror

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $set 5
66
$ the record doesn't contain '='
77
1 no field separator
88

9-
$ field name has out of 0x20-0x7e
9+
$ field name has out of 0x20-0x7d
1010
2 invalid field name
1111

1212
$ the record begins by '='

nls/C@l33t/5.tagerror

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $set 5
66
$ the record doesn't contain '='
77
1 n0 f13ld 53p4r470r
88

9-
$ field name has out of 0x20-0x7e
9+
$ field name has out of 0x20-0x7d
1010
2 1nv4l1d f13ld n4m3
1111

1212
$ the record begins by '='

nls/en_US.ISO8859-1/5.tagerror

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $set 5
66
$ the record doesn't contain '='
77
1 no field separator
88

9-
$ field name has out of 0x20-0x7e
9+
$ field name has out of 0x20-0x7d
1010
2 invalid field name
1111

1212
$ the record begins by '='

nls/en_US.UTF-8/5.tagerror

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $set 5
66
$ the record doesn't contain '='
77
1 no field separator
88

9-
$ field name has out of 0x20-0x7e
9+
$ field name has out of 0x20-0x7d
1010
2 invalid field name
1111

1212
$ the record begins by '='

nls/ja_JP.UTF-8/5.tagerror

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $set 5
66
$ レコードに'='が無い
77
1 項目名と値の区切りが存在しない
88

9-
$ フィールド名がASCIIの0x20〜0x7eに納まっていない
9+
$ フィールド名がASCIIの0x20〜0x7dに納まっていない
1010
2 項目名が不正
1111

1212
$ レコードが'='で始まっていた

nls/ja_JP.eucJP/5.tagerror

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $set 5
66
$ �쥳���ɤ�'='��̵��
77
1 ����̾���ͤζ��ڤ꤬¸�ߤ��ʤ�
88

9-
$ �ե������̾��ASCII��0x20��0x7e��Ǽ�ޤäƤ��ʤ�
9+
$ �ե������̾��ASCII��0x20��0x7d��Ǽ�ޤäƤ��ʤ�
1010
2 ����̾������
1111

1212
$ �쥳���ɤ�'='�ǻϤޤäƤ���

src/ocutil.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ static bool test_tag_field_keepcase(uint8_t *line, size_t n, bool *on_field) {
1111
size_t i;
1212
bool valid = true;
1313
for (i = 0; i < n && line[i] != 0x3d; i++) {
14-
if (!(line[i] >= 0x20 && line[i] <= 0x7e)) {
14+
if (!(line[i] >= 0x20 && line[i] <= 0x7d)) {
1515
valid = false;
1616
}
1717
}
@@ -30,7 +30,7 @@ bool test_tag_field(uint8_t *line, size_t n, bool upcase, bool *on_field, bool *
3030
size_t i;
3131
bool valid = true;
3232
for (i = 0; i < n && line[i] != 0x3d; i++) {
33-
if (!(line[i] >= 0x20 && line[i] <= 0x7e)) {
33+
if (!(line[i] >= 0x20 && line[i] <= 0x7d)) {
3434
valid = false;
3535
}
3636
if (line[i] >= 0x61 && line[i] <= 0x7a) {

src/version.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#define OPUSCOMMENT_VERSION "1.5.6"
1+
#define OPUSCOMMENT_VERSION "1.5.7"
22

33
#define OPUSCOMMENT_REVISION_YEAR (2019 - 1900)
4-
#define OPUSCOMMENT_REVISION_MONTH (5 - 1)
5-
#define OPUSCOMMENT_REVISION_DAY 30
4+
#define OPUSCOMMENT_REVISION_MONTH (6 - 1)
5+
#define OPUSCOMMENT_REVISION_DAY 1

0 commit comments

Comments
 (0)