From d12885235818da5575e6e2dd47fa5657642be418 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sat, 20 Jan 2001 00:05:54 +0000 Subject: [PATCH] In the Programmer's Guide, the sample code for accessing large objects from libpq has two functions with memory leaks. The functions pickout() and overwrite() malloc space for buf which is never freed. See http://www.postgresql.org/users-lounge/docs/7.0/programmer/largeobjects3207.htm This problem is also in the 6.5 docs at http://www.postgresql.org/users-lounge/docs/6.5/programmer/x3184.htm Nishad Prakash --- doc/src/sgml/lobj.sgml | 213 ++++++++++++++++++++++------------------- 1 file changed, 117 insertions(+), 96 deletions(-) diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml index 9d25be88fd..df2d0a098c 100644 --- a/doc/src/sgml/lobj.sgml +++ b/doc/src/sgml/lobj.sgml @@ -1,5 +1,5 @@ @@ -316,48 +316,52 @@ SELECT lo_export(image.raster, '/tmp/motd') from image *-------------------------------------------------------------- */ #include <stdio.h> -#include "libpq-fe.h" -#include "libpq/libpq-fs.h" +#include "libpq-fe.h" +#include "libpq/libpq-fs.h" #define BUFSIZE 1024 /* - * importFile * import file "in_filename" into database as large object "lobjOid" + * importFile * import file "in_filename" into database as large object "lob +jOid" * */ -Oid importFile(PGconn *conn, char *filename) +Oid +importFile(PGconn *conn, char *filename) { - Oid lobjId; - int lobj_fd; - char buf[BUFSIZE]; - int nbytes, tmp; - int fd; + Oid lobjId; + int lobj_fd; + char buf[BUFSIZE]; + int nbytes, + tmp; + int fd; /* * open the file to be read in */ fd = open(filename, O_RDONLY, 0666); - if (fd < 0) { /* error */ - fprintf(stderr, "can't open unix file %s\n", filename); + if (fd < 0) + { /* error */ + fprintf(stderr, "can't open unix file %s\n", filename); } /* * create the large object */ - lobjId = lo_creat(conn, INV_READ|INV_WRITE); - if (lobjId == 0) { - fprintf(stderr, "can't create large object\n"); - } + lobjId = lo_creat(conn, INV_READ | INV_WRITE); + if (lobjId == 0) + fprintf(stderr, "can't create large object\n"); lobj_fd = lo_open(conn, lobjId, INV_WRITE); + /* * read in from the Unix file and write to the inversion file */ - while ((nbytes = read(fd, buf, BUFSIZE)) > 0) { - tmp = lo_write(conn, lobj_fd, buf, nbytes); - if (tmp < nbytes) { - fprintf(stderr, "error while reading large object\n"); - } + while ((nbytes = read(fd, buf, BUFSIZE)) > 0) + { + tmp = lo_write(conn, lobj_fd, buf, nbytes); + if (tmp < nbytes) + fprintf(stderr, "error while reading large object\n"); } (void) close(fd); @@ -366,101 +370,115 @@ Oid importFile(PGconn *conn, char *filename) return lobjId; } -void pickout(PGconn *conn, Oid lobjId, int start, int len) +void +pickout(PGconn *conn, Oid lobjId, int start, int len) { - int lobj_fd; - char* buf; - int nbytes; - int nread; + int lobj_fd; + char *buf; + int nbytes; + int nread; lobj_fd = lo_open(conn, lobjId, INV_READ); - if (lobj_fd < 0) { - fprintf(stderr,"can't open large object %d\n", - lobjId); + if (lobj_fd < 0) + { + fprintf(stderr, "can't open large object %d\n", + lobjId); } lo_lseek(conn, lobj_fd, start, SEEK_SET); - buf = malloc(len+1); + buf = malloc(len + 1); nread = 0; - while (len - nread > 0) { - nbytes = lo_read(conn, lobj_fd, buf, len - nread); - buf[nbytes] = ' '; - fprintf(stderr,">>> %s", buf); - nread += nbytes; + while (len - nread > 0) + { + nbytes = lo_read(conn, lobj_fd, buf, len - nread); + buf[nbytes] = ' '; + fprintf(stderr, ">>> %s", buf); + nread += nbytes; } - fprintf(stderr,"\n"); + free(buf); + fprintf(stderr, "\n"); lo_close(conn, lobj_fd); } -void overwrite(PGconn *conn, Oid lobjId, int start, int len) +void +overwrite(PGconn *conn, Oid lobjId, int start, int len) { - int lobj_fd; - char* buf; - int nbytes; - int nwritten; - int i; + int lobj_fd; + char *buf; + int nbytes; + int nwritten; + int i; lobj_fd = lo_open(conn, lobjId, INV_READ); - if (lobj_fd < 0) { - fprintf(stderr,"can't open large object %d\n", - lobjId); + if (lobj_fd < 0) + { + fprintf(stderr, "can't open large object %d\n", + lobjId); } lo_lseek(conn, lobj_fd, start, SEEK_SET); - buf = malloc(len+1); + buf = malloc(len + 1); - for (i=0;i<len;i++) - buf[i] = 'X'; + for (i = 0; i < len; i++) + buf[i] = 'X'; buf[i] = ' '; nwritten = 0; - while (len - nwritten > 0) { - nbytes = lo_write(conn, lobj_fd, buf + nwritten, len - nwritten); - nwritten += nbytes; + while (len - nwritten > 0) + { + nbytes = lo_write(conn, lobj_fd, buf + nwritten, len - nwritten); + nwritten += nbytes; } - fprintf(stderr,"\n"); + free(buf); + fprintf(stderr, "\n"); lo_close(conn, lobj_fd); } /* - * exportFile * export large object "lobjOid" to file "out_filename" + * exportFile * export large object "lobjOid" to file "out_filename" * */ -void exportFile(PGconn *conn, Oid lobjId, char *filename) +void +exportFile(PGconn *conn, Oid lobjId, char *filename) { - int lobj_fd; - char buf[BUFSIZE]; - int nbytes, tmp; - int fd; + int lobj_fd; + char buf[BUFSIZE]; + int nbytes, + tmp; + int fd; /* - * create an inversion "object" + * create an inversion "object" */ lobj_fd = lo_open(conn, lobjId, INV_READ); - if (lobj_fd < 0) { - fprintf(stderr,"can't open large object %d\n", - lobjId); + if (lobj_fd < 0) + { + fprintf(stderr, "can't open large object %d\n", + lobjId); } /* * open the file to be written to */ - fd = open(filename, O_CREAT|O_WRONLY, 0666); - if (fd < 0) { /* error */ - fprintf(stderr, "can't open unix file %s\n", - filename); + fd = open(filename, O_CREAT | O_WRONLY, 0666); + if (fd < 0) + { /* error */ + fprintf(stderr, "can't open unix file %s\n", + filename); } /* * read in from the Unix file and write to the inversion file */ - while ((nbytes = lo_read(conn, lobj_fd, buf, BUFSIZE)) > 0) { - tmp = write(fd, buf, nbytes); - if (tmp < nbytes) { - fprintf(stderr,"error while writing %s\n", - filename); - } + while ((nbytes = lo_read(conn, lobj_fd, buf, BUFSIZE)) > 0) + { + tmp = write(fd, buf, nbytes); + if (tmp < nbytes) + { + fprintf(stderr, "error while writing %s\n", + filename); + } } (void) lo_close(conn, lobj_fd); @@ -470,25 +488,27 @@ void exportFile(PGconn *conn, Oid lobjId, char *filename) } void -exit_nicely(PGconn* conn) +exit_nicely(PGconn *conn) { - PQfinish(conn); - exit(1); + PQfinish(conn); + exit(1); } int main(int argc, char **argv) { - char *in_filename, *out_filename; - char *database; - Oid lobjOid; - PGconn *conn; - PGresult *res; + char *in_filename, + *out_filename; + char *database; + Oid lobjOid; + PGconn *conn; + PGresult *res; - if (argc != 4) { - fprintf(stderr, "Usage: %s database_name in_filename out_filename\n", - argv[0]); - exit(1); + if (argc != 4) + { + fprintf(stderr, "Usage: %s database_name in_filename out_filename\n", + argv[0]); + exit(1); } database = argv[1]; @@ -501,33 +521,34 @@ main(int argc, char **argv) conn = PQsetdb(NULL, NULL, NULL, NULL, database); /* check to see that the backend connection was successfully made */ - if (PQstatus(conn) == CONNECTION_BAD) { - fprintf(stderr,"Connection to database '%s' failed.\n", database); - fprintf(stderr,"%s",PQerrorMessage(conn)); - exit_nicely(conn); + if (PQstatus(conn) == CONNECTION_BAD) + { + fprintf(stderr, "Connection to database '%s' failed.\n", database); + fprintf(stderr, "%s", PQerrorMessage(conn)); + exit_nicely(conn); } - res = PQexec(conn, "begin"); + res = PQexec(conn, "begin"); PQclear(res); - printf("importing file %s\n", in_filename); + printf("importing file %s\n", in_filename); /* lobjOid = importFile(conn, in_filename); */ lobjOid = lo_import(conn, in_filename); /* - printf("as large object %d.\n", lobjOid); + printf("as large object %d.\n", lobjOid); - printf("picking out bytes 1000-2000 of the large object\n"); + printf("picking out bytes 1000-2000 of the large object\n"); pickout(conn, lobjOid, 1000, 1000); - printf("overwriting bytes 1000-2000 of the large object with X's\n"); + printf("overwriting bytes 1000-2000 of the large object with X's\n"); overwrite(conn, lobjOid, 1000, 1000); */ - printf("exporting large object to file %s\n", out_filename); + printf("exporting large object to file %s\n", out_filename); /* exportFile(conn, lobjOid, out_filename); */ - lo_export(conn, lobjOid,out_filename); + lo_export(conn, lobjOid, out_filename); - res = PQexec(conn, "end"); + res = PQexec(conn, "end"); PQclear(res); PQfinish(conn); exit(0);