← Back to branch summary

~ubuntu-branches/ubuntu/vivid/musl/vivid

~ubuntu-branches/ubuntu/vivid/musl/vivid

« back to all changes in this revision

Viewing changes to src/locale/__mo_lookup.c

Committer: Package Import Robot
Author(s): Kevin Bortis
Date: 2014-05-26 22:45:52 UTC
mfrom: (4.1.4 sid)
Revision ID: package-import@ubuntu.com-20140526224552-qrtsct934q29xo0x

Tags: 1.1.4-1

http://bugs.debian.org/754758

http://bugs.debian.org/750815

* Import upstream version 1.1.4. (Closes: #754758)
* Fixes possible stack-based buffer overflow CVE-2014-3484 (Closes: #750815)
* Includes fix for build regression on armhf and armel

files added:
.gitignore

arch/or1k

arch/or1k/atomic.h

arch/or1k/bits

arch/or1k/bits/alltypes.h.in

arch/or1k/bits/endian.h

arch/or1k/bits/errno.h

arch/or1k/bits/fcntl.h

arch/or1k/bits/fenv.h

arch/or1k/bits/float.h

arch/or1k/bits/io.h

arch/or1k/bits/ioctl.h

arch/or1k/bits/ipc.h

arch/or1k/bits/limits.h

arch/or1k/bits/mman.h

arch/or1k/bits/msg.h

arch/or1k/bits/posix.h

arch/or1k/bits/reg.h

arch/or1k/bits/resource.h

arch/or1k/bits/sem.h

arch/or1k/bits/setjmp.h

arch/or1k/bits/shm.h

arch/or1k/bits/signal.h

arch/or1k/bits/socket.h

arch/or1k/bits/stat.h

arch/or1k/bits/statfs.h

arch/or1k/bits/stdarg.h

arch/or1k/bits/stdint.h

arch/or1k/bits/syscall.h

arch/or1k/bits/termios.h

arch/or1k/bits/user.h

arch/or1k/crt_arch.h

arch/or1k/pthread_arch.h

arch/or1k/reloc.h

arch/or1k/syscall_arch.h

crt/or1k

crt/or1k/crti.s

crt/or1k/crtn.s

include/fmtmsg.h

src/internal/or1k

src/internal/or1k/syscall.s

src/ldso/i386/tlsdesc.s

src/ldso/or1k

src/ldso/or1k/dlsym.s

src/ldso/or1k/start.s

src/ldso/tlsdesc.c

src/ldso/x86_64/tlsdesc.s

src/locale/__lctrans.c

src/locale/__mo_lookup.c

src/locale/__setlocalecat.c

src/locale/bind_textdomain_codeset.c

src/locale/dcngettext.c

src/locale/pleval.c

src/locale/textdomain.c

src/misc/ffsl.c

src/misc/ffsll.c

src/misc/fmtmsg.c

src/misc/issetugid.c

src/network/dns_parse.c

src/network/inet_aton.c

src/network/lookup.h

src/network/lookup_ipliteral.c

src/network/lookup_name.c

src/network/lookup_serv.c

src/network/netlink.c

src/network/netlink.h

src/network/recvmmsg.c

src/network/res_mkquery.c

src/network/res_msend.c

src/network/res_querydomain.c

src/network/res_send.c

src/network/sendmmsg.c

src/setjmp/or1k

src/setjmp/or1k/longjmp.s

src/setjmp/or1k/setjmp.s

src/signal/or1k

src/signal/or1k/sigsetjmp.s

src/thread/__syscall_cp.c

src/thread/__tls_get_addr.c

src/thread/or1k

src/thread/or1k/__set_thread_area.s

src/thread/or1k/__unmapself.s

src/thread/or1k/clone.s

src/thread/or1k/syscall_cp.s

src/thread/pthread_cancel.c

src/thread/pthread_cleanup_push.c

files removed:
src/env/__init_security.c

src/locale/intl.c

src/locale/isalnum_l.c

src/locale/isalpha_l.c

src/locale/isblank_l.c

src/locale/iscntrl_l.c

src/locale/isdigit_l.c

src/locale/isgraph_l.c

src/locale/islower_l.c

src/locale/isprint_l.c

src/locale/ispunct_l.c

src/locale/isspace_l.c

src/locale/isupper_l.c

src/locale/iswalnum_l.c

src/locale/iswalpha_l.c

src/locale/iswblank_l.c

src/locale/iswcntrl_l.c

src/locale/iswctype_l.c

src/locale/iswdigit_l.c

src/locale/iswgraph_l.c

src/locale/iswlower_l.c

src/locale/iswprint_l.c

src/locale/iswpunct_l.c

src/locale/iswspace_l.c

src/locale/iswupper_l.c

src/locale/iswxdigit_l.c

src/locale/isxdigit_l.c

src/locale/strcasecmp_l.c

src/locale/strerror_l.c

src/locale/strncasecmp_l.c

src/locale/tolower_l.c

src/locale/toupper_l.c

src/locale/towctrans_l.c

src/locale/towlower_l.c

src/locale/towupper_l.c

src/locale/wctrans_l.c

src/locale/wctype_l.c

src/network/__dns.c

src/network/__dns.h

src/network/__ipparse.c

src/stat/__fxstat.c

src/stat/__fxstatat.c

src/stat/__lxstat.c

src/thread/cancel_dummy.c

src/thread/cancel_impl.c

src/thread/cancellation.c

files modified:
COPYRIGHT

INSTALL

Makefile

README

VERSION

WHATSNEW

arch/arm/atomic.h

arch/arm/bits/syscall.h

arch/arm/pthread_arch.h

arch/arm/reloc.h

arch/i386/atomic.h

arch/i386/bits/syscall.h

arch/i386/reloc.h

arch/i386/syscall_arch.h

arch/microblaze/atomic.h

arch/microblaze/bits/stat.h

arch/microblaze/bits/syscall.h

arch/microblaze/reloc.h

arch/mips/atomic.h

arch/mips/bits/socket.h

arch/mips/bits/syscall.h

arch/mips/reloc.h

arch/mips/syscall_arch.h

arch/powerpc/atomic.h

arch/powerpc/bits/syscall.h

arch/powerpc/reloc.h

arch/powerpc/syscall_arch.h

arch/sh/atomic.h

arch/sh/bits/ioctl.h

arch/sh/reloc.h

arch/sh/src/atomic.c

arch/x32/atomic.h

arch/x32/bits/syscall.h

arch/x32/reloc.h

arch/x86_64/atomic.h

arch/x86_64/bits/syscall.h

arch/x86_64/reloc.h

configure

debian/changelog

debian/control

debian/tests/build *

include/elf.h

include/netdb.h

include/netinet/if_ether.h

include/netinet/in.h

include/netinet/tcp.h

include/sched.h

include/signal.h

include/strings.h

include/sys/prctl.h

include/sys/socket.h

include/sys/types.h

include/syslog.h

include/unistd.h

src/aio/aio_readwrite.c

src/aio/lio_listio.c

src/conf/sysconf.c

src/ctype/isalnum.c

src/ctype/isalpha.c

src/ctype/isblank.c

src/ctype/iscntrl.c

src/ctype/isdigit.c

src/ctype/isgraph.c

src/ctype/islower.c

src/ctype/isprint.c

src/ctype/ispunct.c

src/ctype/isspace.c

src/ctype/isupper.c

src/ctype/iswalnum.c

src/ctype/iswalpha.c

src/ctype/iswblank.c

src/ctype/iswcntrl.c

src/ctype/iswctype.c

src/ctype/iswdigit.c

src/ctype/iswgraph.c

src/ctype/iswlower.c

src/ctype/iswprint.c

src/ctype/iswpunct.c

src/ctype/iswspace.c

src/ctype/iswupper.c

src/ctype/iswxdigit.c

src/ctype/isxdigit.c

src/ctype/tolower.c

src/ctype/toupper.c

src/ctype/towctrans.c

src/ctype/wctrans.c

src/env/__init_tls.c

src/env/__libc_start_main.c

src/errno/__errno_location.c

src/errno/strerror.c

src/exit/exit.c

src/exit/quick_exit.c

src/fcntl/open.c

src/internal/libc.h

src/internal/locale_impl.h

src/internal/pthread_impl.h

src/internal/syscall.h

src/ldso/arm/start.s

src/ldso/dynlink.c

src/ldso/i386/start.s

src/ldso/microblaze/start.s

src/ldso/mips/start.s

src/ldso/powerpc/start.s

src/ldso/sh/start.s

src/ldso/start.c

src/ldso/x32/start.s

src/ldso/x86_64/start.s

src/legacy/getpass.c

src/linux/epoll.c

src/linux/eventfd.c

src/linux/fanotify.c

src/linux/inotify.c

src/linux/prlimit.c

src/linux/signalfd.c

src/linux/utimes.c

src/locale/codepages.h

src/locale/duplocale.c

src/locale/langinfo.c

src/locale/legacychars.h

src/locale/newlocale.c

src/locale/setlocale.c

src/locale/strcoll.c

src/locale/strfmon.c

src/locale/strxfrm.c

src/locale/uselocale.c

src/locale/wcscoll.c

src/locale/wcsxfrm.c

src/misc/getauxval.c

src/misc/getopt.c

src/misc/getrlimit.c

src/misc/realpath.c

src/misc/setrlimit.c

src/misc/syslog.c

src/mman/mmap.c

src/multibyte/mbrtowc.c

src/multibyte/mbtowc.c

src/multibyte/wcsrtombs.c

src/network/dn_comp.c

src/network/dn_expand.c

src/network/ent.c

src/network/gai_strerror.c

src/network/getaddrinfo.c

src/network/gethostbyaddr_r.c

src/network/gethostbyname2_r.c

src/network/getifaddrs.c

src/network/getnameinfo.c

src/network/getservbyname.c

src/network/getservbyname_r.c

src/network/hstrerror.c

src/network/if_nameindex.c

src/network/if_nametoindex.c

src/network/inet_addr.c

src/network/inet_legacy.c

src/network/proto.c

src/network/res_init.c

src/network/res_query.c

src/network/socket.c

src/network/socketpair.c

src/process/execvp.c

src/process/fork.c

src/process/posix_spawn.c

src/process/vfork.c

src/regex/regerror.c

src/regex/regexec.c

src/sched/sched_yield.c

src/select/poll.c

src/select/pselect.c

src/select/select.c

src/setjmp/microblaze/setjmp.s

src/signal/signal.c

src/stat/__xstat.c

src/stat/chmod.c

src/stat/fchmod.c

src/stat/fchmodat.c

src/stat/fstat.c

src/stat/futimesat.c

src/stat/lstat.c

src/stat/mkdir.c

src/stat/mknod.c

src/stat/stat.c

src/stat/utimensat.c

src/stdio/__fopen_rb_ca.c

src/stdio/__stdio_exit.c

src/stdio/__toread.c

src/stdio/__towrite.c

src/stdio/fflush.c

src/stdio/fopen.c

src/stdio/ftrylockfile.c

src/stdio/fwide.c

src/stdio/remove.c

src/stdio/rename.c

src/stdio/stderr.c

src/stdio/stdin.c

src/stdio/stdout.c

src/stdio/tempnam.c

src/stdio/tmpfile.c

src/stdio/tmpnam.c

src/stdio/vasprintf.c

src/stdio/vfprintf.c

src/stdio/vfwprintf.c

src/stdio/vfwscanf.c

src/string/memmem.c

src/string/strcasecmp.c

src/string/strncasecmp.c

src/string/strsignal.c

src/string/strstr.c

src/string/wcsstr.c

src/thread/i386/__set_thread_area.s

src/thread/i386/tls.s

src/thread/pthread_cond_broadcast.c

src/thread/pthread_cond_timedwait.c

src/thread/pthread_create.c

src/thread/pthread_key_create.c

src/thread/pthread_kill.c

src/thread/pthread_mutex_consistent.c

src/thread/pthread_mutex_timedlock.c

src/thread/pthread_mutex_trylock.c

src/thread/pthread_mutex_unlock.c

src/thread/pthread_setcanceltype.c

src/thread/pthread_testcancel.c

src/thread/synccall.c

src/time/__map_file.c

src/time/__tz.c

src/time/strftime.c

src/time/strptime.c

src/time/utime.c

src/time/wcsftime.c

src/unistd/access.c

src/unistd/chown.c

src/unistd/dup2.c

src/unistd/dup3.c

src/unistd/fchown.c

src/unistd/getpgrp.c

src/unistd/lchown.c

src/unistd/link.c

src/unistd/pause.c

src/unistd/pipe.c

src/unistd/readlink.c

src/unistd/rmdir.c

src/unistd/symlink.c

src/unistd/unlink.c

Show diffs side-by-side

added added

removed removed

src/locale/__mo_lookup.c

1

#include <stdint.h>

2

#include <string.h>

3

4

static inline uint32_t swapc(uint32_t x, int c)

5

{

6

return c ? x>>24 | x>>8&0xff00 | x<<8&0xff0000 | x<<24 : x;

7

}

8

9

const char *__mo_lookup(const void *p, size_t size, const char *s)

10

{

11

const uint32_t *mo = p;

12

int sw = *mo - 0x950412de;

13

uint32_t b = 0, n = swapc(mo[2], sw);

14

uint32_t o = swapc(mo[3], sw);

15

uint32_t t = swapc(mo[4], sw);

16

if (n>=size/4 || o>=size-4*n || t>=size-4*n || ((o|t)%4))

17

return 0;

18

o/=4;

19

t/=4;

20

for (;;) {

21

uint32_t ol = swapc(mo[o+2*(b+n/2)], sw);

22

uint32_t os = swapc(mo[o+2*(b+n/2)+1], sw);

23

if (os >= size || ol >= size-os || ((char *)p)[os+ol])

24

return 0;

25

int sign = strcmp(s, (char *)p + os);

26

if (!sign) {

27

uint32_t tl = swapc(mo[t+2*(b+n/2)], sw);

28

uint32_t ts = swapc(mo[t+2*(b+n/2)+1], sw);

29

if (ts >= size || tl >= size-ts || ((char *)p)[ts+tl])

30

return 0;

31

return (char *)p + ts;

32

}

33

else if (n == 1) return 0;

34

else if (sign < 0)

35

n /= 2;

36

else {

37

b += n/2;

38

n -= n/2;

39

}

40

}

41

return 0;

42

}

Older »