mirror of
git://slackware.nl/current.git
synced 2024-12-27 09:59:16 +01:00
b76270bf9e
Wed May 19 08:58:23 UTC 2010 Slackware 13.1 x86_64 stable is released! Lots of thanks are due -- see the RELEASE_NOTES and the rest of the ChangeLog for credits. The ISOs are on their way to replication, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. We are taking pre-orders now at store.slackware.com, and offering a discount if you sign up for a subscription. Consider picking up a copy to help support the project. Thanks again to the Slackware community for testing, contributing, and generally holding us to a high level of quality. :-) Enjoy!
41 lines
851 B
Diff
41 lines
851 B
Diff
--- ./ntext.cc.orig 2008-02-22 09:51:22.000000000 -0600
|
|
+++ ./ntext.cc 2010-02-19 21:53:58.000000000 -0600
|
|
@@ -33,6 +33,7 @@
|
|
#include <gtk/gtkselection.h>
|
|
#include "ntext.h"
|
|
#include "global.h"
|
|
+#include <assert.h>
|
|
|
|
NLine::NLine() {
|
|
Text = NULL;
|
|
@@ -238,23 +239,27 @@
|
|
int i;
|
|
NLine *nl;
|
|
char *p;
|
|
+ char *s;
|
|
|
|
if (len < 0) {
|
|
discardExcess();
|
|
return;
|
|
}
|
|
|
|
- p = strchr(text, '\n');
|
|
+ s = strdup(text);
|
|
+ assert(s != NULL);
|
|
+ p = strchr(s, '\n');
|
|
if (p!=NULL) {
|
|
*p = 0;
|
|
- i = strlen(text);
|
|
- nl = new NLine(text, color);
|
|
+ i = strlen(s);
|
|
+ nl = new NLine(s, color);
|
|
*p = '\n';
|
|
lines.push_back(nl);
|
|
formatLine(lines.size()-1);
|
|
append(&p[1], len-(i+1), color);
|
|
return;
|
|
}
|
|
+ free (s);
|
|
|
|
// if search for \n failed, this is a single line
|
|
nl = new NLine(text, color);
|