rpms/grip/EL-4 grip.split-utf-8-strings.patch, NONE, 1.1 grip.spec, 1.23, 1.24
Adrian Reber
adrian at fedoraproject.org
Tue Nov 11 08:06:13 UTC 2008
- Previous message (by thread): rpms/autofs/devel autofs-5.0.2-init-cb-on-load.patch, 1.2, NONE autofs-5.0.3-active-restart.patch, 1.1, NONE autofs-5.0.3-add-missing-uris-list-locking.patch, 1.1, NONE autofs-5.0.3-add-replicated-debug-logging.patch, 1.1, NONE autofs-5.0.3-add-umount_wait-parameter.patch, 1.1, NONE autofs-5.0.3-allow-dir-create-on-nfs-root.patch, 1.1, NONE autofs-5.0.3-basedn-with-spaces-fix-3.patch, 1.2, NONE autofs-5.0.3-check-direct-path-len.patch, 1.1, NONE autofs-5.0.3-check-for-kernel-automount-fix.patch, 1.1, NONE autofs-5.0.3-check-for-kernel-automount.patch, 1.1, NONE autofs-5.0.3-check-replicated-list-after-probe.patch, 1.1, NONE autofs-5.0.3-clear-stale-on-map-read.patch, 1.1, NONE autofs-5.0.3-correct-ldap-lib.patch, 1.1, NONE autofs-5.0.3-dont-abuse-ap-ghost-field.patch, 1.1, NONE autofs-5.0.3-dont-block-on-expire.patch, 1.1, NONE autofs-5.0.3-dont-fail-on-empty-master-fix-2.patch, 1.1, NONE autofs-5.0.3-dont-readmap-on-hup-for-new-mount.patch, 1.1, NONE autofs-5.0.3-dont-use-proc-for-is-running-check.patch, 1.1, NONE autofs-5.0.3-expire-thread-create-cond-handling.patch, 1.1, NONE autofs-5.0.3-expire-works-too-hard.patch, 1.1, NONE autofs-5.0.3-fix-bad-alloca-usage.patch, 1.2, NONE autofs-5.0.3-fix-couple-of-memory-leaks.patch, 1.1, NONE autofs-5.0.3-fix-fd-leak-at-multi-mount-fail.patch, 1.1, NONE autofs-5.0.3-fix-get-user-info-check.patch, 1.1, NONE autofs-5.0.3-fix-ifc-buff-size-fix-2.patch, 1.1, NONE autofs-5.0.3-fix-ifc-buff-size.patch, 1.2, NONE autofs-5.0.3-fix-included-browse-map-not-found.patch, 1.1, NONE autofs-5.0.3-fix-incorrect-multi-mount-mountpoint.patch, 1.1, NONE autofs-5.0.3-fix-master-map-lexer-eval-order.patch, 1.2, NONE autofs-5.0.3-fix-multi-mount-race.patch, 1.1, NONE autofs-5.0.3-fix-multi-source-messages.patch, 1.1, NONE autofs-5.0.3-fix-nfs4-colon-escape.patch, 1.1, NONE autofs-5.0.3-fix-percent-hack.patch, 1.1, NONE autofs-5.0.3-fix-proximity-other-timeout.patch, 1.1, NONE autofs-5.0.3-fix-rootless-direct-multi-mount-expire.patch, 1.1, NONE autofs-5.0.3-handle-zero-length-nis-key-update.patch, 1.1, NONE autofs-5.0.3-handle-zero-length-nis-key.patch, 1.1, NONE autofs-5.0.3-ldap-page-control-configure-fix.patch, 1.1, NONE autofs-5.0.3-library-reload-fix.patch, 1.1, NONE autofs-5.0.3-lookup-next-soucre-stale-entry.patch, 1.1, NONE autofs-5.0.3-make-handle_mounts-startup-cond-distinct.patch, 1.1, NONE autofs-5.0.3-map-type-in-map-name-fix.patch, 1.1, NONE autofs-5.0.3-map-type-in-map-name.patch, 1.4, NONE autofs-5.0.3-mount-thread-create-cond-handling-fix.patch, 1.1, NONE autofs-5.0.3-mount-thread-create-cond-handling.patch, 1.3, NONE autofs-5.0.3-mtab-as-proc-mounts-fix.patch, 1.1, NONE autofs-5.0.3-mtab-as-proc-mounts.patch, 1.1, NONE autofs-5.0.3-nfs4-tcp-only.patch, 1.1, NONE autofs-5.0.3-nisplus-partial-and-free.patch, 1.1, NONE autofs-5.0.3-nss-source-any.patch, 1.2, NONE autofs-5.0.3-override-is-running-check.patch, 1.1, NONE autofs-5.0.3-refactor-mount-request-vars.patch, 1.1, NONE autofs-5.0.3-remove-redundant-dns-name-lookups.patch, 1.1, NONE autofs-5.0.3-submount-shutdown-recovery-12-fix.patch, 1.1, NONE autofs-5.0.3-submount-shutdown-recovery-12.patch, 1.1, NONE autofs-5.0.3-unlink-mount-return-fix.patch, 1.1, NONE autofs-5.0.3-update-replicated-doco.patch, 1.1, NONE autofs-5.0.3-use-dev-urandom.patch, 1.1, NONE autofs-5.0.3-wait-submount-expire-complete.patch, 1.1, NONE autofs-5.0.3-xfn-not-supported.patch, 1.1, NONE
- Next message (by thread): rpms/autofs/devel autofs.spec,1.257,1.258
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: adrian
Update of /cvs/extras/rpms/grip/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21885
Modified Files:
grip.spec
Added Files:
grip.split-utf-8-strings.patch
Log Message:
* Mon Nov 10 2008 Adrian Reber <adrian at lisas.de> - 1:3.2.0-25
- fixed "grip breaks utf-8 sequences up when writing xmcd CD database file"
(#466656)
grip.split-utf-8-strings.patch:
--- NEW FILE grip.split-utf-8-strings.patch ---
diff --git a/src/discdb.c b/src/discdb.c
index c21a608..49d6475 100644
--- a/src/discdb.c
+++ b/src/discdb.c
@@ -684,34 +684,70 @@ int DiscDBReadDiscData(DiscInfo *disc,DiscData *ddata)
return 0;
}
+static void print_header(char *header,int num,FILE *outfile)
+{
+ if(num==-1)
+ fprintf(outfile,"%s=",header);
+ else
+ fprintf(outfile,"%s%d=",header,num);
+}
+
static void DiscDBWriteLine(char *header,int num,char *data,FILE *outfile,
char *encoding)
{
int len;
- char *offset;
+ int tmp;
if(strcasecmp(encoding,"utf-8")) {
StrConvertEncoding(data,"utf-8",encoding,512);
}
len=strlen(data);
- offset=data;
for(;;) {
- if(len>70) {
- if(num==-1)
- fprintf(outfile,"%s=%.70s\n",header,offset);
- else fprintf(outfile,"%s%d=%.70s\n",header,num,offset);
-
- offset+=70;
- len-=70;
- }
- else {
- if(num==-1) fprintf(outfile,"%s=%s\n",header,offset);
- else fprintf(outfile,"%s%d=%s\n",header,num,offset);
- break;
+ tmp=0;
+ print_header(header,num,outfile);
+ if(len<=0)
+ goto end;
+ for(;;) {
+ tmp++;
+ fprintf(outfile,"%c",*data);
+ if(--len<=0)
+ goto end;
+ data++;
+ if(tmp>65) {
+ /* check if starting from the 65 character a
+ * UTF-8 multibyte character is present
+ * according to wikipedia
+ * 0x80-0xBF Second, third, or fourth byte of a multi-byte sequence
+ * 0xC0-0xC1 Overlong encoding: start of a 2-byte sequence,
+ * but code point <= 127
+ * 0xC2-0xDF Start of 2-byte sequence
+ * 0xE0-0xEF Start of 3-byte sequence
+ * 0xF0-0xF4 Start of 4-byte sequence
+ *
+ * so to test if it is < 0x80 seems good enough */
+ if((*(data-1) & 0xFF) < 0x80) {
+ /* no UTF-8 char; then it is time for a new line */
+ fprintf(outfile,"\n");
+ break;
+ }
+ /* let's see if the next character is the starting of a
+ * 2/3/4-byte sequence; if yes we print now also a new-line;
+ * all this can only be done if the next character actually exists */
+ if(len>0) {
+ if(((*data & 0xFF) >= 0xC2) && ((*data & 0xFF) <= 0xF4)) {
+ fprintf(outfile,"\n");
+ break;
+ }
+ }
+ }
}
}
+
+end:
+ if(len<=0)
+ fprintf(outfile,"\n");
}
Index: grip.spec
===================================================================
RCS file: /cvs/extras/rpms/grip/EL-4/grip.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- grip.spec 9 Nov 2008 14:59:07 -0000 1.23
+++ grip.spec 11 Nov 2008 08:05:43 -0000 1.24
@@ -1,7 +1,7 @@
Summary: Front-end for CD rippers and Ogg Vorbis encoders
Name: grip
Version: 3.2.0
-Release: 24%{?dist}
+Release: 25%{?dist}
Epoch: 1
License: GPLv2+
Group: Applications/Multimedia
@@ -14,6 +14,7 @@
Patch5: grip-3.2.0-lookup.patch
Patch6: grip-3.2.0-executionpatch.patch
Patch7: grip.834724.patch
+Patch8: grip.split-utf-8-strings.patch
URL: http://www.nostatic.org/grip/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: vorbis-tools
@@ -37,6 +38,7 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
+%patch8 -p1
%build
@@ -98,6 +100,10 @@
%{_mandir}/man1/*
%changelog
+* Mon Nov 10 2008 Adrian Reber <adrian at lisas.de> - 1:3.2.0-25
+- fixed "grip breaks utf-8 sequences up when writing xmcd CD database file"
+ (#466656)
+
* Sun Nov 09 2008 Adrian Reber <adrian at lisas.de> - 1:3.2.0-24
- fixed "buffer overflow caused by large amount of CDDB replies" (#470552)
(CVE-2005-0706)
- Previous message (by thread): rpms/autofs/devel autofs-5.0.2-init-cb-on-load.patch, 1.2, NONE autofs-5.0.3-active-restart.patch, 1.1, NONE autofs-5.0.3-add-missing-uris-list-locking.patch, 1.1, NONE autofs-5.0.3-add-replicated-debug-logging.patch, 1.1, NONE autofs-5.0.3-add-umount_wait-parameter.patch, 1.1, NONE autofs-5.0.3-allow-dir-create-on-nfs-root.patch, 1.1, NONE autofs-5.0.3-basedn-with-spaces-fix-3.patch, 1.2, NONE autofs-5.0.3-check-direct-path-len.patch, 1.1, NONE autofs-5.0.3-check-for-kernel-automount-fix.patch, 1.1, NONE autofs-5.0.3-check-for-kernel-automount.patch, 1.1, NONE autofs-5.0.3-check-replicated-list-after-probe.patch, 1.1, NONE autofs-5.0.3-clear-stale-on-map-read.patch, 1.1, NONE autofs-5.0.3-correct-ldap-lib.patch, 1.1, NONE autofs-5.0.3-dont-abuse-ap-ghost-field.patch, 1.1, NONE autofs-5.0.3-dont-block-on-expire.patch, 1.1, NONE autofs-5.0.3-dont-fail-on-empty-master-fix-2.patch, 1.1, NONE autofs-5.0.3-dont-readmap-on-hup-for-new-mount.patch, 1.1, NONE autofs-5.0.3-dont-use-proc-for-is-running-check.patch, 1.1, NONE autofs-5.0.3-expire-thread-create-cond-handling.patch, 1.1, NONE autofs-5.0.3-expire-works-too-hard.patch, 1.1, NONE autofs-5.0.3-fix-bad-alloca-usage.patch, 1.2, NONE autofs-5.0.3-fix-couple-of-memory-leaks.patch, 1.1, NONE autofs-5.0.3-fix-fd-leak-at-multi-mount-fail.patch, 1.1, NONE autofs-5.0.3-fix-get-user-info-check.patch, 1.1, NONE autofs-5.0.3-fix-ifc-buff-size-fix-2.patch, 1.1, NONE autofs-5.0.3-fix-ifc-buff-size.patch, 1.2, NONE autofs-5.0.3-fix-included-browse-map-not-found.patch, 1.1, NONE autofs-5.0.3-fix-incorrect-multi-mount-mountpoint.patch, 1.1, NONE autofs-5.0.3-fix-master-map-lexer-eval-order.patch, 1.2, NONE autofs-5.0.3-fix-multi-mount-race.patch, 1.1, NONE autofs-5.0.3-fix-multi-source-messages.patch, 1.1, NONE autofs-5.0.3-fix-nfs4-colon-escape.patch, 1.1, NONE autofs-5.0.3-fix-percent-hack.patch, 1.1, NONE autofs-5.0.3-fix-proximity-other-timeout.patch, 1.1, NONE autofs-5.0.3-fix-rootless-direct-multi-mount-expire.patch, 1.1, NONE autofs-5.0.3-handle-zero-length-nis-key-update.patch, 1.1, NONE autofs-5.0.3-handle-zero-length-nis-key.patch, 1.1, NONE autofs-5.0.3-ldap-page-control-configure-fix.patch, 1.1, NONE autofs-5.0.3-library-reload-fix.patch, 1.1, NONE autofs-5.0.3-lookup-next-soucre-stale-entry.patch, 1.1, NONE autofs-5.0.3-make-handle_mounts-startup-cond-distinct.patch, 1.1, NONE autofs-5.0.3-map-type-in-map-name-fix.patch, 1.1, NONE autofs-5.0.3-map-type-in-map-name.patch, 1.4, NONE autofs-5.0.3-mount-thread-create-cond-handling-fix.patch, 1.1, NONE autofs-5.0.3-mount-thread-create-cond-handling.patch, 1.3, NONE autofs-5.0.3-mtab-as-proc-mounts-fix.patch, 1.1, NONE autofs-5.0.3-mtab-as-proc-mounts.patch, 1.1, NONE autofs-5.0.3-nfs4-tcp-only.patch, 1.1, NONE autofs-5.0.3-nisplus-partial-and-free.patch, 1.1, NONE autofs-5.0.3-nss-source-any.patch, 1.2, NONE autofs-5.0.3-override-is-running-check.patch, 1.1, NONE autofs-5.0.3-refactor-mount-request-vars.patch, 1.1, NONE autofs-5.0.3-remove-redundant-dns-name-lookups.patch, 1.1, NONE autofs-5.0.3-submount-shutdown-recovery-12-fix.patch, 1.1, NONE autofs-5.0.3-submount-shutdown-recovery-12.patch, 1.1, NONE autofs-5.0.3-unlink-mount-return-fix.patch, 1.1, NONE autofs-5.0.3-update-replicated-doco.patch, 1.1, NONE autofs-5.0.3-use-dev-urandom.patch, 1.1, NONE autofs-5.0.3-wait-submount-expire-complete.patch, 1.1, NONE autofs-5.0.3-xfn-not-supported.patch, 1.1, NONE
- Next message (by thread): rpms/autofs/devel autofs.spec,1.257,1.258
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list