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

« back to all changes in this revision

Viewing changes to src/locale/strfmon.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
* 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
3
3
#include <stdarg.h>
4
4
#include <monetary.h>
5
5
#include <errno.h>
 
6
#include "locale_impl.h"
6
7
 
7
8
static ssize_t vstrfmon_l(char *s, size_t n, locale_t loc, const char *fmt, va_list ap)
8
9
{
93
94
        ssize_t ret;
94
95
 
95
96
        va_start(ap, fmt);
96
 
        ret = vstrfmon_l(s, n, 0, fmt, ap);
 
97
        ret = vstrfmon_l(s, n, CURRENT_LOCALE, fmt, ap);
97
98
        va_end(ap);
98
99
 
99
100
        return ret;