pidgin/ljfisher-ssl-client-auth

Complete the conversion of win32 utsname construction to bounds-checked access.

2011-07-17, Ethan Blanton
d98bb67efec6
Parents 116ec59ce4ea
Children 7216d16cf3bc
Complete the conversion of win32 utsname construction to bounds-checked access.

This patch changes strcat to g_strlcat with appropriate bounds.
1 files changed, 5 insertions(+), 5 deletions(-)
  • +5 -5
    libpurple/protocols/jabber/win32/posix.uname.c
    • --- a/libpurple/protocols/jabber/win32/posix.uname.c Sun Jul 17 20:52:50 2011 +0000
    +++ b/libpurple/protocols/jabber/win32/posix.uname.c Sun Jul 17 20:55:12 2011 +0000
    @@ -58,28 +58,28 @@
    switch( OS_version.dwPlatformId )
    {
    case VER_PLATFORM_WIN32_NT:
    - strcat( uts->sysname, "WinNT" );
    + g_strlcat( uts->sysname, "WinNT", sizeof(uts->sysname) );
    MingwOS = WinNT;
    break;
    case VER_PLATFORM_WIN32_WINDOWS:
    switch ( OS_version.dwMinorVersion )
    {
    case 0:
    - strcat( uts->sysname, "Win95" );
    + g_strlcat( uts->sysname, "Win95", sizeof(uts->sysname) );
    MingwOS = Win95;
    break;
    case 10:
    - strcat( uts->sysname, "Win98" );
    + g_strlcat( uts->sysname, "Win98", sizeof(uts->sysname) );
    MingwOS = Win98;
    break;
    default:
    - strcat( uts->sysname, "Win??" );
    + g_strlcat( uts->sysname, "Win??", sizeof(uts->sysname) );
    MingwOS = unknown;
    break;
    }
    break;
    default:
    - strcat( uts->sysname, "Win??" );
    + g_strlcat( uts->sysname, "Win??", sizeof(uts->sysname) );
    MingwOS = unknown;
    break;
    }