← Back to branch summary

~ubuntu-branches/ubuntu/natty/postgresql-8.4/natty-security

« back to all changes in this revision

Viewing changes to src/interfaces/ecpg/compatlib/informix.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-07-11 16:59:35 UTC
  • mfrom: (5.1.1 karmic)
  • Revision ID: james.westby@ubuntu.com-20090711165935-jfwin6gfrxf0gfsi
Tags: 8.4.0-2
http://bugs.debian.org/536139
* debian/libpq-dev.install: Ship catalog/genbki.h. (Closes: #536139)
* debian/rules: Drop --enable-cassert for final release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/interfaces/ecpg/compatlib/informix.c
1
 
/* $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/informix.c,v 1.57 2009/01/15 11:52:54 petere Exp $ */
 
1
/* $PostgreSQL: pgsql/src/interfaces/ecpg/compatlib/informix.c,v 1.59 2009/06/11 14:49:13 momjian Exp $ */
2
2
 
3
3
#define POSTGRES_ECPG_INTERNAL
4
4
#include "postgres_fe.h"
151
151
ecpg_strndup(const char *str, size_t len)
152
152
{
153
153
        int                     real_len = strlen(str);
154
 
        int                     use_len = (real_len > len) ? len : real_len;
 
154
        int                     use_len = (real_len > len) ? (int) len : real_len;
155
155
 
156
156
        char       *new = malloc(use_len + 1);
157
157