Hi Attached the patch for the version I uploaded. Please respond if you think that the attached patch won't work.
Cheers Luk -- Luk Claes - http://people.debian.org/~luk - GPG key 1024D/9B7C328D Fingerprint: D5AF 25FB 316B 53BB 08E7 F999 E544 DE07 9B7C 328D
diff -u flac-1.1.2/debian/changelog flac-1.1.2/debian/changelog
--- flac-1.1.2/debian/changelog
+++ flac-1.1.2/debian/changelog
@@ -1,3 +1,10 @@
+flac (1.1.2-3.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Turn EOF warnings into errors (Closes: #340960).
+
+ -- Luk Claes <[EMAIL PROTECTED]> Tue, 28 Feb 2006 23:28:02 +0100
+
flac (1.1.2-3) unstable; urgency=medium
* Brown paper bag release.
only in patch2:
unchanged:
--- flac-1.1.2.orig/src/flac/encode.c
+++ flac-1.1.2/src/flac/encode.c
@@ -397,8 +397,8 @@
return
EncoderSession_finish_error(&encoder_session);
}
else if(feof(infile)) {
- flac__utils_printf(stderr, 1,
"%s: WARNING: unexpected EOF; expected %u samples, got %u samples\n",
encoder_session.inbasefilename, (unsigned
int)encoder_session.total_samples_to_encode, (unsigned
int)encoder_session.samples_written);
- data_bytes= 0;
+ flac__utils_printf(stderr, 1,
"%s: ERROR: unexpected EOF; expected %u samples, got %u samples\n",
encoder_session.inbasefilename, (unsigned
int)encoder_session.total_samples_to_encode, (unsigned
int)encoder_session.samples_written);
+ return
EncoderSession_finish_error(&encoder_session);
}
}
else {
@@ -456,7 +456,8 @@
return
EncoderSession_finish_error(&encoder_session);
}
else if(bytes_read !=
(*options.common.align_reservoir_samples) * bytes_per_frame) {
-
flac__utils_printf(stderr, 1, "%s: WARNING: unexpected EOF; read %u bytes;
expected %u samples, got %u samples\n", encoder_session.inbasefilename,
(unsigned int)bytes_read, (unsigned
int)encoder_session.total_samples_to_encode, (unsigned
int)encoder_session.samples_written);
+
flac__utils_printf(stderr, 1, "%s: ERROR: unexpected EOF; read %u bytes;
expected %u samples, got %u samples\n", encoder_session.inbasefilename,
(unsigned int)bytes_read, (unsigned
int)encoder_session.total_samples_to_encode, (unsigned
int)encoder_session.samples_written);
+ return
EncoderSession_finish_error(&encoder_session);
}
else {
info_align_carry=
*options.common.align_reservoir_samples;
@@ -735,8 +736,8 @@
return
EncoderSession_finish_error(&encoder_session);
}
else if(feof(infile)) {
- flac__utils_printf(stderr, 1,
"%s: WARNING: unexpected EOF; expected %u samples, got %u samples\n",
encoder_session.inbasefilename,
(unsigned)encoder_session.total_samples_to_encode,
(unsigned)encoder_session.samples_written);
- data_bytes = 0;
+ flac__utils_printf(stderr, 1,
"%s: ERROR: unexpected EOF; expected %u samples, got %u samples\n",
encoder_session.inbasefilename,
(unsigned)encoder_session.total_samples_to_encode,
(unsigned)encoder_session.samples_written);
+ return
EncoderSession_finish_error(&encoder_session);
}
}
else {
@@ -794,8 +795,8 @@
return
EncoderSession_finish_error(&encoder_session);
}
else if(bytes_read !=
(*options.common.align_reservoir_samples) * bytes_per_wide_sample) {
-
flac__utils_printf(stderr, 1, "%s: WARNING: unexpected EOF; read %u bytes;
expected %u samples, got %u samples\n", encoder_session.inbasefilename,
(unsigned)bytes_read, (unsigned)encoder_session.total_samples_to_encode,
(unsigned)encoder_session.samples_written);
- data_bytes = 0;
+
flac__utils_printf(stderr, 1, "%s: ERROR: unexpected EOF; read %u bytes;
expected %u samples, got %u samples\n", encoder_session.inbasefilename,
(unsigned)bytes_read, (unsigned)encoder_session.total_samples_to_encode,
(unsigned)encoder_session.samples_written);
+ return
EncoderSession_finish_error(&encoder_session);
}
else {
info_align_carry =
*options.common.align_reservoir_samples;
@@ -1046,8 +1047,8 @@
return
EncoderSession_finish_error(&encoder_session);
}
else if(feof(infile)) {
- flac__utils_printf(stderr, 1, "%s:
WARNING: unexpected EOF; expected %u samples, got %u samples\n",
encoder_session.inbasefilename,
(unsigned)encoder_session.total_samples_to_encode,
(unsigned)encoder_session.samples_written);
- total_input_bytes_read =
max_input_bytes;
+ flac__utils_printf(stderr, 1, "%s:
ERROR: unexpected EOF; expected %u samples, got %u samples\n",
encoder_session.inbasefilename,
(unsigned)encoder_session.total_samples_to_encode,
(unsigned)encoder_session.samples_written);
+ return
EncoderSession_finish_error(&encoder_session);
}
}
else {
@@ -1098,7 +1099,8 @@
return
EncoderSession_finish_error(&encoder_session);
}
else if(bytes_read !=
(*options.common.align_reservoir_samples) * bytes_per_wide_sample) {
- flac__utils_printf(stderr, 1, "%s:
WARNING: unexpected EOF; read %u bytes; expected %u samples, got %u samples\n",
encoder_session.inbasefilename, (unsigned)bytes_read,
(unsigned)encoder_session.total_samples_to_encode,
(unsigned)encoder_session.samples_written);
+ flac__utils_printf(stderr, 1, "%s:
ERROR: unexpected EOF; read %u bytes; expected %u samples, got %u samples\n",
encoder_session.inbasefilename, (unsigned)bytes_read,
(unsigned)encoder_session.total_samples_to_encode,
(unsigned)encoder_session.samples_written);
+ return
EncoderSession_finish_error(&encoder_session);
}
else {
info_align_carry =
*options.common.align_reservoir_samples;
signature.asc
Description: OpenPGP digital signature
